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

consolidation

Browse source
This commit is contained in:
Peter Cottle 2012-12-14 01:44:59 -08:00
parent 4607d130ce
commit 6b125d194c
9 changed files with 1284 additions and 1284 deletions
Download patch file Download diff file Expand all files Collapse all files

2546
build/bundle.js
View file

File diff suppressed because it is too large Load diff

0
src/js/app/main.js → src/js/app/index.js
View file

4
src/js/collections/index.js
View file

@ -1,7 +1,7 @@
var Commit = require('../git').Commit; var Commit = require('../git').Commit;
var Branch = require('../git').Branch; var Branch = require('../git').Branch;
var Main = require('../app/main'); var Main = require('../app');
var Command = require('../models/commandModel').Command; var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry; var CommandEntry = require('../models/commandModel').CommandEntry;
var TIME = require('../constants').TIME; var TIME = require('../constants').TIME;
@ -29,7 +29,7 @@ var CommandBuffer = Backbone.Model.extend({
}, },
initialize: function(options) { initialize: function(options) {
require('../app/main').getEvents().on('gitCommandReady', _.bind( require('../app').getEvents().on('gitCommandReady', _.bind(
this.addCommand, this this.addCommand, this
)); ));

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

@ -1,6 +1,6 @@
var AnimationFactoryModule = require('../animation/animationFactory'); var AnimationFactoryModule = require('../animation/animationFactory');
var animationFactory = new AnimationFactoryModule.AnimationFactory(); var animationFactory = new AnimationFactoryModule.AnimationFactory();
var Main = require('../app/main'); var Main = require('../app');
var AnimationQueue = require('../animation').AnimationQueue; var AnimationQueue = require('../animation').AnimationQueue;
var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView; var InteractiveRebaseView = require('../views/miscViews').InteractiveRebaseView;

4
src/js/models/commandModel.js
View file

@ -182,7 +182,7 @@ var Command = Backbone.Model.extend({
}); });
}], }],
[/^refresh$/, function() { [/^refresh$/, function() {
var events = require('../app/main').getEvents(); var events = require('../app').getEvents();
events.trigger('refreshTree'); events.trigger('refreshTree');
throw new CommandResult({ throw new CommandResult({
@ -190,7 +190,7 @@ var Command = Backbone.Model.extend({
}); });
}], }],
[/^rollup (\d+)$/, function(bits) { [/^rollup (\d+)$/, function(bits) {
var events = require('../app/main').getEvents(); var events = require('../app').getEvents();
// go roll up these commands by joining them with semicolons // go roll up these commands by joining them with semicolons
events.trigger('rollupCommands', bits[1]); events.trigger('rollupCommands', bits[1]);

4
src/js/util/debug.js
View file

@ -1,5 +1,5 @@
var toGlobalize = { var toGlobalize = {
Tree: require('../tree'), Tree: require('../visuals/tree'),
Visuals: require('../visuals'), Visuals: require('../visuals'),
Git: require('../git'), Git: require('../git'),
CommandModel: require('../models/commandModel'), CommandModel: require('../models/commandModel'),
@ -8,7 +8,7 @@ var toGlobalize = {
Collections: require('../collections'), Collections: require('../collections'),
Async: require('../animation'), Async: require('../animation'),
AnimationFactory: require('../animation/animationFactory'), AnimationFactory: require('../animation/animationFactory'),
Main: require('../app/main') Main: require('../app')
}; };
_.each(toGlobalize, function(module) { _.each(toGlobalize, function(module) {

2
src/js/views/commandViews.js
View file

@ -1,5 +1,5 @@
var CommandEntryCollection = require('../collections').CommandEntryCollection; var CommandEntryCollection = require('../collections').CommandEntryCollection;
var Main = require('../app/main'); var Main = require('../app');
var Command = require('../models/commandModel').Command; var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry; var CommandEntry = require('../models/commandModel').CommandEntry;

4
src/js/visuals/index.js
View file

@ -1,4 +1,4 @@
var Main = require('../app/main'); var Main = require('../app');
var GRAPHICS = require('../constants').GRAPHICS; var GRAPHICS = require('../constants').GRAPHICS;
var GLOBAL = require('../constants').GLOBAL; var GLOBAL = require('../constants').GLOBAL;
@ -6,7 +6,7 @@ var Collections = require('../collections');
var CommitCollection = Collections.CommitCollection; var CommitCollection = Collections.CommitCollection;
var BranchCollection = Collections.BranchCollection; var BranchCollection = Collections.BranchCollection;
var Tree = require('../tree'); var Tree = require('../visuals/tree');
var VisEdgeCollection = Tree.VisEdgeCollection; var VisEdgeCollection = Tree.VisEdgeCollection;
var VisBranchCollection = Tree.VisBranchCollection; var VisBranchCollection = Tree.VisBranchCollection;
var VisNode = Tree.VisNode; var VisNode = Tree.VisNode;

2
src/js/tree/index.js → src/js/visuals/tree.js
View file

@ -1,4 +1,4 @@
var Main = require('../app/main'); var Main = require('../app');
var GRAPHICS = require('../constants').GRAPHICS; var GRAPHICS = require('../constants').GRAPHICS;
var randomHueString = function() { var randomHueString = function() {