diff --git a/build/bundle.js b/build/bundle.js index e8890e60..1a3cf272 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -2908,7 +2908,6 @@ AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, co if (!animationQueue) { throw new Error("Need animation queue to add closure to!"); } - alert('wtf'); var time = GRAPHICS.defaultAnimationTime * 1.0; var bounceTime = time * 2; @@ -5215,12 +5214,12 @@ exports.VisBranch = VisBranch; }); -require.define("/levels/index.js",function(require,module,exports,__dirname,__filename,process,global){// static class... -function LevelEngine() { +require.define("/git/treeCompare.js",function(require,module,exports,__dirname,__filename,process,global){// static class... +function TreeCompare() { } -LevelEngine.prototype.compareBranchesWithinTrees = function(treeA, treeB, branches) { +TreeCompare.prototype.compareBranchesWithinTrees = function(treeA, treeB, branches) { var result = true; _.each(branches, function(branchName) { result = result && this.compareBranchWithinTrees(treeA, treeB, branchName); @@ -5229,7 +5228,7 @@ LevelEngine.prototype.compareBranchesWithinTrees = function(treeA, treeB, branch return result; }; -LevelEngine.prototype.compareBranchWithinTrees = function(treeA, treeB, branchName) { +TreeCompare.prototype.compareBranchWithinTrees = function(treeA, treeB, branchName) { treeA = this.convertTreeSafe(treeA); treeB = this.convertTreeSafe(treeB); @@ -5264,14 +5263,14 @@ LevelEngine.prototype.compareBranchWithinTrees = function(treeA, treeB, branchNa recurseCompare(treeA.commits[branchA.target], treeB.commits[branchB.target]); }; -LevelEngine.prototype.convertTreeSafe = function(tree) { +TreeCompare.prototype.convertTreeSafe = function(tree) { if (typeof tree == 'string') { return JSON.parse(unescape(tree)); } return tree; }; -LevelEngine.prototype.stripTreeFields = function(trees) { +TreeCompare.prototype.stripTreeFields = function(trees) { var stripFields = ['createTime', 'author', 'commitMessage']; var sortFields = ['children', 'parents']; @@ -5289,7 +5288,7 @@ LevelEngine.prototype.stripTreeFields = function(trees) { }); }; -LevelEngine.prototype.compareTrees = function(treeA, treeB) { +TreeCompare.prototype.compareTrees = function(treeA, treeB) { treeA = this.convertTreeSafe(treeA); treeB = this.convertTreeSafe(treeB); @@ -5300,10 +5299,7 @@ LevelEngine.prototype.compareTrees = function(treeA, treeB) { return _.isEqual(treeA, treeB); }; -var levelEngine = new LevelEngine(); - -exports.LevelEngine = LevelEngine; - +exports.TreeCompare = TreeCompare; }); @@ -7015,12 +7011,12 @@ exports.Ref = Ref; }); require("/git/index.js"); -require.define("/levels/index.js",function(require,module,exports,__dirname,__filename,process,global){// static class... -function LevelEngine() { +require.define("/git/treeCompare.js",function(require,module,exports,__dirname,__filename,process,global){// static class... +function TreeCompare() { } -LevelEngine.prototype.compareBranchesWithinTrees = function(treeA, treeB, branches) { +TreeCompare.prototype.compareBranchesWithinTrees = function(treeA, treeB, branches) { var result = true; _.each(branches, function(branchName) { result = result && this.compareBranchWithinTrees(treeA, treeB, branchName); @@ -7029,7 +7025,7 @@ LevelEngine.prototype.compareBranchesWithinTrees = function(treeA, treeB, branch return result; }; -LevelEngine.prototype.compareBranchWithinTrees = function(treeA, treeB, branchName) { +TreeCompare.prototype.compareBranchWithinTrees = function(treeA, treeB, branchName) { treeA = this.convertTreeSafe(treeA); treeB = this.convertTreeSafe(treeB); @@ -7064,14 +7060,14 @@ LevelEngine.prototype.compareBranchWithinTrees = function(treeA, treeB, branchNa recurseCompare(treeA.commits[branchA.target], treeB.commits[branchB.target]); }; -LevelEngine.prototype.convertTreeSafe = function(tree) { +TreeCompare.prototype.convertTreeSafe = function(tree) { if (typeof tree == 'string') { return JSON.parse(unescape(tree)); } return tree; }; -LevelEngine.prototype.stripTreeFields = function(trees) { +TreeCompare.prototype.stripTreeFields = function(trees) { var stripFields = ['createTime', 'author', 'commitMessage']; var sortFields = ['children', 'parents']; @@ -7089,7 +7085,7 @@ LevelEngine.prototype.stripTreeFields = function(trees) { }); }; -LevelEngine.prototype.compareTrees = function(treeA, treeB) { +TreeCompare.prototype.compareTrees = function(treeA, treeB) { treeA = this.convertTreeSafe(treeA); treeB = this.convertTreeSafe(treeB); @@ -7100,13 +7096,10 @@ LevelEngine.prototype.compareTrees = function(treeA, treeB) { return _.isEqual(treeA, treeB); }; -var levelEngine = new LevelEngine(); - -exports.LevelEngine = LevelEngine; - +exports.TreeCompare = TreeCompare; }); -require("/levels/index.js"); +require("/git/treeCompare.js"); require.define("/models/collections.js",function(require,module,exports,__dirname,__filename,process,global){var Commit = require('../git').Commit; var Branch = require('../git').Branch; @@ -7646,7 +7639,7 @@ require.define("/util/debug.js",function(require,module,exports,__dirname,__file Visuals: require('../visuals'), Git: require('../git'), CommandModel: require('../models/commandModel'), - Levels: require('../levels'), + Levels: require('../git/treeCompare'), Constants: require('../util/constants'), Collections: require('../models/collections'), Async: require('../visuals/animation'), @@ -8283,7 +8276,6 @@ AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, co if (!animationQueue) { throw new Error("Need animation queue to add closure to!"); } - alert('wtf'); var time = GRAPHICS.defaultAnimationTime * 1.0; var bounceTime = time * 2; diff --git a/src/js/util/debug.js b/src/js/util/debug.js index 55713e64..67b5f7af 100644 --- a/src/js/util/debug.js +++ b/src/js/util/debug.js @@ -3,7 +3,7 @@ var toGlobalize = { Visuals: require('../visuals'), Git: require('../git'), CommandModel: require('../models/commandModel'), - Levels: require('../levels'), + Levels: require('../git/treeCompare'), Constants: require('../util/constants'), Collections: require('../models/collections'), Async: require('../visuals/animation'), diff --git a/todo.txt b/todo.txt index 9483c168..fb22be3c 100644 --- a/todo.txt +++ b/todo.txt @@ -25,7 +25,6 @@ Big Bugs to fix: ** Publish Things ** ************************************/ - cross browser support -- minify JS - fix terminal input when extra long 2013 Things