mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-01 10:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

all done except for maybe 3d thing

Browse source
This commit is contained in:
Peter Cottle 2012-12-24 12:47:53 -08:00
parent d825573ef9
commit d6a7a11337
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
build/bundle.js
View file

@ -13737,6 +13737,7 @@ var MultiView = Backbone.View.extend({
markdown: 'Im second' markdown: 'Im second'
} }
}]; }];
this.deferred = options.deferred;
this.childViews = []; this.childViews = [];
this.currentIndex = 0; this.currentIndex = 0;
@ -13793,8 +13794,11 @@ var MultiView = Backbone.View.extend({
}, },
finish: function() { finish: function() {
// promise resolve?? if (this.deferred) {
console.log('promise resolve :D'); this.deferred.resolve();
} else {
console.warn('no promise to resolve');
}
}, },
createChildView: function(viewJSON) { createChildView: function(viewJSON) {
@ -17062,6 +17066,7 @@ var MultiView = Backbone.View.extend({
markdown: 'Im second' markdown: 'Im second'
} }
}]; }];
this.deferred = options.deferred;
this.childViews = []; this.childViews = [];
this.currentIndex = 0; this.currentIndex = 0;
@ -17118,8 +17123,11 @@ var MultiView = Backbone.View.extend({
}, },
finish: function() { finish: function() {
// promise resolve?? if (this.deferred) {
console.log('promise resolve :D'); this.deferred.resolve();
} else {
console.warn('no promise to resolve');
}
}, },
createChildView: function(viewJSON) { createChildView: function(viewJSON) {

8
src/js/views/multiView.js
View file

@ -34,6 +34,7 @@ var MultiView = Backbone.View.extend({
markdown: 'Im second' markdown: 'Im second'
} }
}]; }];
this.deferred = options.deferred;
this.childViews = []; this.childViews = [];
this.currentIndex = 0; this.currentIndex = 0;
@ -90,8 +91,11 @@ var MultiView = Backbone.View.extend({
}, },
finish: function() { finish: function() {
// promise resolve?? if (this.deferred) {
console.log('promise resolve :D'); this.deferred.resolve();
} else {
console.warn('no promise to resolve');
}
}, },
createChildView: function(viewJSON) { createChildView: function(viewJSON) {

13
todo.txt
View file

@ -4,7 +4,6 @@ Big things:
Big Graphic things: Big Graphic things:
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
[.] multiViews with multiple terminals...
[ ] 3d transition between terminals (reveal.JS hakim) [ ] 3d transition between terminals (reveal.JS hakim)
Medium things: Medium things:
@ -12,14 +11,13 @@ Medium things:
Views 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 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: Small things to implement:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -39,6 +37,9 @@ Big Bugs to fix:
Done things: Done things:
(I only started this on Dec 17th 2012 to get a better sense of what was done) (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] markdown parsing yay!!
[x] check animation for command entry fading nicely wtf [x] check animation for command entry fading nicely wtf
[x] no more CSS ids in views [x] no more CSS ids in views