diff --git a/build/bundle.js b/build/bundle.js index 52f6af58..2188e54c 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -5174,12 +5174,6 @@ var CommandEntryCollection = Backbone.Collection.extend({ localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null }); -if (Backbone.LocalStorage) { - console.log('local storage there'); -} else { - console.log('not htere'); -} - var CommandBuffer = Backbone.Model.extend({ defaults: { collection: null @@ -7619,7 +7613,7 @@ var Command = Backbone.Model.extend({ return { 'git commit': /^gc($|\s)/, 'git add': /^ga($|\s)/, - 'git checkout': /^gchk($|\s)/, + 'git checkout': /^go($|\s)/, 'git rebase': /^gr($|\s)/, 'git branch': /^gb($|\s)/ }; @@ -7727,6 +7721,7 @@ var Command = Backbone.Model.extend({ var regex = tuple[0]; var results = regex.exec(str); if (results) { + // this will throw a result tuple[1](results); } }); @@ -7738,7 +7733,8 @@ var Command = Backbone.Model.extend({ if (results) { str = method + ' ' + str.slice(results[0].length); } - }); + this.set('rawStr', str); + }, this); // see if begins with git if (str.slice(0,3) !== 'git') { @@ -11372,12 +11368,6 @@ var CommandEntryCollection = Backbone.Collection.extend({ localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null }); -if (Backbone.LocalStorage) { - console.log('local storage there'); -} else { - console.log('not htere'); -} - var CommandBuffer = Backbone.Model.extend({ defaults: { collection: null @@ -11579,7 +11569,7 @@ var Command = Backbone.Model.extend({ return { 'git commit': /^gc($|\s)/, 'git add': /^ga($|\s)/, - 'git checkout': /^gchk($|\s)/, + 'git checkout': /^go($|\s)/, 'git rebase': /^gr($|\s)/, 'git branch': /^gb($|\s)/ }; @@ -11687,6 +11677,7 @@ var Command = Backbone.Model.extend({ var regex = tuple[0]; var results = regex.exec(str); if (results) { + // this will throw a result tuple[1](results); } }); @@ -11698,7 +11689,8 @@ var Command = Backbone.Model.extend({ if (results) { str = method + ' ' + str.slice(results[0].length); } - }); + this.set('rawStr', str); + }, this); // see if begins with git if (str.slice(0,3) !== 'git') { diff --git a/src/js/models/collections.js b/src/js/models/collections.js index 443dc33a..ee20fbdb 100644 --- a/src/js/models/collections.js +++ b/src/js/models/collections.js @@ -33,12 +33,6 @@ var CommandEntryCollection = Backbone.Collection.extend({ localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null }); -if (Backbone.LocalStorage) { - console.log('local storage there'); -} else { - console.log('not htere'); -} - var CommandBuffer = Backbone.Model.extend({ defaults: { collection: null diff --git a/src/js/models/commandModel.js b/src/js/models/commandModel.js index 298ee381..f2aa618d 100644 --- a/src/js/models/commandModel.js +++ b/src/js/models/commandModel.js @@ -116,7 +116,7 @@ var Command = Backbone.Model.extend({ return { 'git commit': /^gc($|\s)/, 'git add': /^ga($|\s)/, - 'git checkout': /^gchk($|\s)/, + 'git checkout': /^go($|\s)/, 'git rebase': /^gr($|\s)/, 'git branch': /^gb($|\s)/ }; @@ -224,6 +224,7 @@ var Command = Backbone.Model.extend({ var regex = tuple[0]; var results = regex.exec(str); if (results) { + // this will throw a result tuple[1](results); } }); @@ -235,7 +236,8 @@ var Command = Backbone.Model.extend({ if (results) { str = method + ' ' + str.slice(results[0].length); } - }); + this.set('rawStr', str); + }, this); // see if begins with git if (str.slice(0,3) !== 'git') { diff --git a/todo.txt b/todo.txt index 55c58d51..a4ebbc23 100644 --- a/todo.txt +++ b/todo.txt @@ -3,12 +3,13 @@ Big things: Big Graphic things: ~~~~~~~~~~~~~~~~~~~~~~~~~ -- better dialog support (above / below the fold) +[ ] better dialog support (above / below the fold) Medium things: ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- gitEngine loads from tree immediately, not the weird thing we have now! -- headless Git for testing (send it commands and expected trees) +[ ] gitEngine loads from tree immediately, not the weird thing we have now! +[.] headless Git for testing (send it commands and expected trees) +[.] few tests Small things to implement: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -25,8 +26,8 @@ Big Bugs to fix: - cross browser support... ? - fix terminal input when extra long -2013 Things -~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Tree layout with the layout engine provided in d3.js, that white-paper algorithm. Only tricky thing is that merge commits mess up the "tree" aspect and it doesn't directly support weighting, but I can probably throw that in. -Would require mixing both algorthims and probably some real time dedication +Done things: +(I only started this on Dec 17th 2012 to get a better sense of what was done) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +[x] aliases replace when put into commands