mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 23:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

animation factory now a this

Browse source
This commit is contained in:
Peter Cottle 2012-12-15 23:38:50 -08:00
parent dce6b41161
commit 7722114fb0
2 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
build/bundle.js
View file

@ -1238,7 +1238,6 @@ exports.CommandBuffer = CommandBuffer;
}); });
require.define("/git/index.js",function(require,module,exports,__dirname,__filename,process,global){var AnimationFactoryModule = require('../visuals/animation/animationFactory'); require.define("/git/index.js",function(require,module,exports,__dirname,__filename,process,global){var AnimationFactoryModule = require('../visuals/animation/animationFactory');
var animationFactory = new AnimationFactoryModule.AnimationFactory();
var Main = require('../app'); var Main = require('../app');
var AnimationQueue = require('../visuals/animation').AnimationQueue; var AnimationQueue = require('../visuals/animation').AnimationQueue;
var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView; var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView;
@ -1263,6 +1262,8 @@ function GitEngine(options) {
this.branchCollection = options.branches; this.branchCollection = options.branches;
this.commitCollection = options.collection; this.commitCollection = options.collection;
this.gitVisuals = options.gitVisuals; this.gitVisuals = options.gitVisuals;
this.animationFactory = options.animationFactory ||
new AnimationFactoryModule.AnimationFactory();
// global variable to keep track of the options given // global variable to keep track of the options given
// along with the command call. // along with the command call.
@ -1646,7 +1647,7 @@ GitEngine.prototype.revertStarter = function() {
var response = this.revert(this.generalArgs); var response = this.revert(this.generalArgs);
if (response) { if (response) {
animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
} }
}; };
@ -1732,7 +1733,7 @@ GitEngine.prototype.cherrypickStarter = function() {
this.validateArgBounds(this.generalArgs, 1, 1); this.validateArgBounds(this.generalArgs, 1, 1);
var newCommit = this.cherrypick(this.generalArgs[0]); var newCommit = this.cherrypick(this.generalArgs[0]);
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.cherrypick = function(ref) { GitEngine.prototype.cherrypick = function(ref) {
@ -1795,7 +1796,7 @@ GitEngine.prototype.commitStarter = function() {
newCommit.set('commitMessage', msg); newCommit.set('commitMessage', msg);
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.commit = function() { GitEngine.prototype.commit = function() {
@ -2132,7 +2133,7 @@ GitEngine.prototype.rebaseStarter = function() {
return; return;
} }
animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
}; };
GitEngine.prototype.rebase = function(targetSource, currentLocation) { GitEngine.prototype.rebase = function(targetSource, currentLocation) {
@ -2248,7 +2249,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
// finish the rebase crap and animate! // finish the rebase crap and animate!
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals);
this.animationQueue.start(); this.animationQueue.start();
}, this); }, this);
@ -2349,11 +2350,11 @@ GitEngine.prototype.mergeStarter = function() {
if (newCommit === undefined) { if (newCommit === undefined) {
// its just a fast forwrard // its just a fast forwrard
animationFactory.refreshTree(this.animationQueue, this.gitVisuals); this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
return; return;
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.merge = function(targetSource, currentLocation) { GitEngine.prototype.merge = function(targetSource, currentLocation) {
@ -2583,7 +2584,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
// only add the refresh if we didn't do manual animations // only add the refresh if we didn't do manual animations
if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) { if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) {
animationFactory.refreshTree(this.animationQueue, this.gitVisuals); this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
} }
// animation queue will call the callback when its done // animation queue will call the callback when its done
@ -5362,7 +5363,6 @@ exports.getUI = function() {
require("/app/index.js"); require("/app/index.js");
require.define("/git/index.js",function(require,module,exports,__dirname,__filename,process,global){var AnimationFactoryModule = require('../visuals/animation/animationFactory'); require.define("/git/index.js",function(require,module,exports,__dirname,__filename,process,global){var AnimationFactoryModule = require('../visuals/animation/animationFactory');
var animationFactory = new AnimationFactoryModule.AnimationFactory();
var Main = require('../app'); var Main = require('../app');
var AnimationQueue = require('../visuals/animation').AnimationQueue; var AnimationQueue = require('../visuals/animation').AnimationQueue;
var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView; var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView;
@ -5387,6 +5387,8 @@ function GitEngine(options) {
this.branchCollection = options.branches; this.branchCollection = options.branches;
this.commitCollection = options.collection; this.commitCollection = options.collection;
this.gitVisuals = options.gitVisuals; this.gitVisuals = options.gitVisuals;
this.animationFactory = options.animationFactory ||
new AnimationFactoryModule.AnimationFactory();
// global variable to keep track of the options given // global variable to keep track of the options given
// along with the command call. // along with the command call.
@ -5770,7 +5772,7 @@ GitEngine.prototype.revertStarter = function() {
var response = this.revert(this.generalArgs); var response = this.revert(this.generalArgs);
if (response) { if (response) {
animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
} }
}; };
@ -5856,7 +5858,7 @@ GitEngine.prototype.cherrypickStarter = function() {
this.validateArgBounds(this.generalArgs, 1, 1); this.validateArgBounds(this.generalArgs, 1, 1);
var newCommit = this.cherrypick(this.generalArgs[0]); var newCommit = this.cherrypick(this.generalArgs[0]);
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.cherrypick = function(ref) { GitEngine.prototype.cherrypick = function(ref) {
@ -5919,7 +5921,7 @@ GitEngine.prototype.commitStarter = function() {
newCommit.set('commitMessage', msg); newCommit.set('commitMessage', msg);
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.commit = function() { GitEngine.prototype.commit = function() {
@ -6256,7 +6258,7 @@ GitEngine.prototype.rebaseStarter = function() {
return; return;
} }
animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
}; };
GitEngine.prototype.rebase = function(targetSource, currentLocation) { GitEngine.prototype.rebase = function(targetSource, currentLocation) {
@ -6372,7 +6374,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
// finish the rebase crap and animate! // finish the rebase crap and animate!
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals);
this.animationQueue.start(); this.animationQueue.start();
}, this); }, this);
@ -6473,11 +6475,11 @@ GitEngine.prototype.mergeStarter = function() {
if (newCommit === undefined) { if (newCommit === undefined) {
// its just a fast forwrard // its just a fast forwrard
animationFactory.refreshTree(this.animationQueue, this.gitVisuals); this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
return; return;
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.merge = function(targetSource, currentLocation) { GitEngine.prototype.merge = function(targetSource, currentLocation) {
@ -6707,7 +6709,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
// only add the refresh if we didn't do manual animations // only add the refresh if we didn't do manual animations
if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) { if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) {
animationFactory.refreshTree(this.animationQueue, this.gitVisuals); this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
} }
// animation queue will call the callback when its done // animation queue will call the callback when its done

19
src/js/git/index.js
View file

@ -1,5 +1,4 @@
var AnimationFactoryModule = require('../visuals/animation/animationFactory'); var AnimationFactoryModule = require('../visuals/animation/animationFactory');
var animationFactory = new AnimationFactoryModule.AnimationFactory();
var Main = require('../app'); var Main = require('../app');
var AnimationQueue = require('../visuals/animation').AnimationQueue; var AnimationQueue = require('../visuals/animation').AnimationQueue;
var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView; var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView;
@ -24,6 +23,8 @@ function GitEngine(options) {
this.branchCollection = options.branches; this.branchCollection = options.branches;
this.commitCollection = options.collection; this.commitCollection = options.collection;
this.gitVisuals = options.gitVisuals; this.gitVisuals = options.gitVisuals;
this.animationFactory = options.animationFactory ||
new AnimationFactoryModule.AnimationFactory();
// global variable to keep track of the options given // global variable to keep track of the options given
// along with the command call. // along with the command call.
@ -407,7 +408,7 @@ GitEngine.prototype.revertStarter = function() {
var response = this.revert(this.generalArgs); var response = this.revert(this.generalArgs);
if (response) { if (response) {
animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
} }
}; };
@ -493,7 +494,7 @@ GitEngine.prototype.cherrypickStarter = function() {
this.validateArgBounds(this.generalArgs, 1, 1); this.validateArgBounds(this.generalArgs, 1, 1);
var newCommit = this.cherrypick(this.generalArgs[0]); var newCommit = this.cherrypick(this.generalArgs[0]);
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.cherrypick = function(ref) { GitEngine.prototype.cherrypick = function(ref) {
@ -556,7 +557,7 @@ GitEngine.prototype.commitStarter = function() {
newCommit.set('commitMessage', msg); newCommit.set('commitMessage', msg);
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.commit = function() { GitEngine.prototype.commit = function() {
@ -893,7 +894,7 @@ GitEngine.prototype.rebaseStarter = function() {
return; return;
} }
animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
}; };
GitEngine.prototype.rebase = function(targetSource, currentLocation) { GitEngine.prototype.rebase = function(targetSource, currentLocation) {
@ -1009,7 +1010,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
// finish the rebase crap and animate! // finish the rebase crap and animate!
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals);
this.animationQueue.start(); this.animationQueue.start();
}, this); }, this);
@ -1110,11 +1111,11 @@ GitEngine.prototype.mergeStarter = function() {
if (newCommit === undefined) { if (newCommit === undefined) {
// its just a fast forwrard // its just a fast forwrard
animationFactory.refreshTree(this.animationQueue, this.gitVisuals); this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
return; return;
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals); this.animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.merge = function(targetSource, currentLocation) { GitEngine.prototype.merge = function(targetSource, currentLocation) {
@ -1344,7 +1345,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
// only add the refresh if we didn't do manual animations // only add the refresh if we didn't do manual animations
if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) { if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) {
animationFactory.refreshTree(this.animationQueue, this.gitVisuals); this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
} }
// animation queue will call the callback when its done // animation queue will call the callback when its done