diff --git a/build/bundle.js b/build/bundle.js index 9b300ffd..0b965408 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -13737,6 +13737,7 @@ var MultiView = Backbone.View.extend({ markdown: 'Im second' } }]; + this.deferred = options.deferred; this.childViews = []; this.currentIndex = 0; @@ -13793,8 +13794,11 @@ var MultiView = Backbone.View.extend({ }, finish: function() { - // promise resolve?? - console.log('promise resolve :D'); + if (this.deferred) { + this.deferred.resolve(); + } else { + console.warn('no promise to resolve'); + } }, createChildView: function(viewJSON) { @@ -17062,6 +17066,7 @@ var MultiView = Backbone.View.extend({ markdown: 'Im second' } }]; + this.deferred = options.deferred; this.childViews = []; this.currentIndex = 0; @@ -17118,8 +17123,11 @@ var MultiView = Backbone.View.extend({ }, finish: function() { - // promise resolve?? - console.log('promise resolve :D'); + if (this.deferred) { + this.deferred.resolve(); + } else { + console.warn('no promise to resolve'); + } }, createChildView: function(viewJSON) { diff --git a/src/js/views/multiView.js b/src/js/views/multiView.js index 26566d9f..81e4b706 100644 --- a/src/js/views/multiView.js +++ b/src/js/views/multiView.js @@ -34,6 +34,7 @@ var MultiView = Backbone.View.extend({ markdown: 'Im second' } }]; + this.deferred = options.deferred; this.childViews = []; this.currentIndex = 0; @@ -90,8 +91,11 @@ var MultiView = Backbone.View.extend({ }, finish: function() { - // promise resolve?? - console.log('promise resolve :D'); + if (this.deferred) { + this.deferred.resolve(); + } else { + console.warn('no promise to resolve'); + } }, createChildView: function(viewJSON) { diff --git a/todo.txt b/todo.txt index 6014542e..daa64cf6 100644 --- a/todo.txt +++ b/todo.txt @@ -4,7 +4,6 @@ Big things: Big Graphic things: ~~~~~~~~~~~~~~~~~~~~~~~~~ -[.] multiViews with multiple terminals... [ ] 3d transition between terminals (reveal.JS hakim) Medium things: @@ -12,14 +11,13 @@ Medium things: Views ========= -[ ] allow views to have optional "with" view that gets appended afterwards -[ ] multiview makes all these arrow views which fire events -[ ] debounce the forward and back methods -[ ] there! that should be good enough Commands ======== -[ ] refactor some kind of +[ ] refactor some kind of 'filter' that processes or yields commands +[ ] then each sandbox is essentially a series of filters +[ ] make a shim so a level engine can check after every git command if + they succeeded and then do finish animation Small things to implement: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -39,6 +37,9 @@ Big Bugs to fix: Done things: (I only started this on Dec 17th 2012 to get a better sense of what was done) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +[x] multiViews with multiple terminals... +[x] debounce the forward and back methods +[x] multiview makes all these arrow views which fire events [x] markdown parsing yay!! [x] check animation for command entry fading nicely wtf [x] no more CSS ids in views