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

massive linting

Browse source
This commit is contained in:
Peter Cottle 2012-12-13 18:56:41 -08:00
parent 5dc7fc0bed
commit 48dd558de1
8 changed files with 189 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

176
build/bundle.js
View file

@ -1,4 +1,5 @@
(function(){var require = function (file, cwd) { (function(){
var require = function (file, cwd) {
var resolved = require.resolve(file, cwd || '/'); var resolved = require.resolve(file, cwd || '/');
var mod = require.modules[resolved]; var mod = require.modules[resolved];
if (!mod) throw new Error( if (!mod) throw new Error(
@ -786,7 +787,7 @@ GitEngine.prototype.getDetachedHead = function() {
}; };
GitEngine.prototype.validateBranchName = function(name) { GitEngine.prototype.validateBranchName = function(name) {
name = name.replace(/\s/g, ''); name = name.replace(/\s/g, '');
if (!/^[a-zA-Z0-9]+$/.test(name)) { if (!/^[a-zA-Z0-9]+$/.test(name)) {
throw new GitError({ throw new GitError({
msg: 'woah bad branch name!! This is not ok: ' + name msg: 'woah bad branch name!! This is not ok: ' + name
@ -917,7 +918,7 @@ GitEngine.prototype.validateArgBounds = function(args, lower, upper, option) {
GitEngine.prototype.oneArgImpliedHead = function(args, option) { GitEngine.prototype.oneArgImpliedHead = function(args, option) {
// for log, show, etc // for log, show, etc
this.validateArgBounds(args, 0, 1, option); this.validateArgBounds(args, 0, 1, option);
if (args.length == 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
} }
}; };
@ -955,7 +956,7 @@ GitEngine.prototype.revert = function(whichCommits) {
animationResponse.toRebaseArray = toRebase.slice(0); animationResponse.toRebaseArray = toRebase.slice(0);
animationResponse.rebaseSteps = []; animationResponse.rebaseSteps = [];
beforeSnapshot = this.gitVisuals.genSnapshot(); var beforeSnapshot = this.gitVisuals.genSnapshot();
var afterSnapshot; var afterSnapshot;
// now make a bunch of commits on top of where we are // now make a bunch of commits on top of where we are
@ -1056,22 +1057,23 @@ GitEngine.prototype.commitStarter = function() {
} }
var msg = null; var msg = null;
var args = null;
if (this.commandOptions['-a']) { if (this.commandOptions['-a']) {
this.command.addWarning('No need to add files in this demo'); this.command.addWarning('No need to add files in this demo');
} }
if (this.commandOptions['-am']) { if (this.commandOptions['-am']) {
var args = this.commandOptions['-am']; args = this.commandOptions['-am'];
this.validateArgBounds(args, 1, 1, '-am'); this.validateArgBounds(args, 1, 1, '-am');
this.command.addWarning("Don't worry about adding files in this demo. I'll take " + this.command.addWarning("Don't worry about adding files in this demo. I'll take " +
"down your commit message anyways, but you can commit without a message " + "down your commit message anyways, but you can commit without a message " +
"in this demo as well"); "in this demo as well");
msg = args[0]; msg = args[0];
} }
if (this.commandOptions['-m']) { if (this.commandOptions['-m']) {
var args = this.commandOptions['-m']; args = this.commandOptions['-m'];
this.validateArgBounds(args, 1, 1, '-m'); this.validateArgBounds(args, 1, 1, '-m');
msg = args[0]; msg = args[0];
} }
@ -1090,7 +1092,7 @@ GitEngine.prototype.commitStarter = function() {
GitEngine.prototype.commit = function() { GitEngine.prototype.commit = function() {
var targetCommit = this.getCommitFromRef(this.HEAD); var targetCommit = this.getCommitFromRef(this.HEAD);
var id = undefined; var id = null;
// if we want to ammend, go one above // if we want to ammend, go one above
if (this.commandOptions['--amend']) { if (this.commandOptions['--amend']) {
@ -1139,7 +1141,7 @@ GitEngine.prototype.resolveStringRef = function(ref) {
// may be something like HEAD~2 or master^^ // may be something like HEAD~2 or master^^
var relativeRefs = [ var relativeRefs = [
[/^([a-zA-Z0-9]+)~(\d+)\s*$/, function(matches) { [/^([a-zA-Z0-9]+)~(\d+)\s*$/, function(matches) {
return parseInt(matches[2]); return parseInt(matches[2], 10);
}], }],
[/^([a-zA-Z0-9]+)(\^+)\s*$/, function(matches) { [/^([a-zA-Z0-9]+)(\^+)\s*$/, function(matches) {
return matches[2].length; return matches[2].length;
@ -1196,7 +1198,7 @@ GitEngine.prototype.setTargetLocation = function(ref, target) {
// sets whatever ref is (branch, HEAD, etc) to a target. so if // sets whatever ref is (branch, HEAD, etc) to a target. so if
// you pass in HEAD, and HEAD is pointing to a branch, it will update // you pass in HEAD, and HEAD is pointing to a branch, it will update
// the branch to that commit, not the HEAD // the branch to that commit, not the HEAD
var ref = this.getOneBeforeCommit(ref); ref = this.getOneBeforeCommit(ref);
ref.set('target', target); ref.set('target', target);
}; };
@ -1281,7 +1283,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
// //
// hence we need to do a BFS search, with the commit date being the // hence we need to do a BFS search, with the commit date being the
// value to sort off of (rather than just purely the level) // value to sort off of (rather than just purely the level)
if (numBack == 0) { if (numBack === 0) {
return commit; return commit;
} }
@ -1308,7 +1310,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
numBack--; numBack--;
} }
if (numBack !== 0 || pQueue.length == 0) { if (numBack !== 0 || pQueue.length === 0) {
throw new GitError({ throw new GitError({
msg: "Sorry, I can't go that many commits back" msg: "Sorry, I can't go that many commits back"
}); });
@ -1338,7 +1340,7 @@ GitEngine.prototype.rebaseAltID = function(id) {
// here we switch from C''' to C'^4 // here we switch from C''' to C'^4
return bits[0].slice(0, -3) + "'^4"; return bits[0].slice(0, -3) + "'^4";
}], }],
[/^C(\d+)['][^](\d+)$/, function(bits) { [/^C(\d+)['][\^](\d+)$/, function(bits) {
return 'C' + String(bits[1]) + "'^" + String(Number(bits[2]) + 1); return 'C' + String(bits[1]) + "'^" + String(Number(bits[2]) + 1);
}] }]
]; ];
@ -1378,7 +1380,7 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
// return the 4 from C4, plus the length of the quotes // return the 4 from C4, plus the length of the quotes
return scale * bits[1] + bits[2].length; return scale * bits[1] + bits[2].length;
}], }],
[/^C(\d+)['][^](\d+)$/, function(bits) { [/^C(\d+)['][\^](\d+)$/, function(bits) {
return scale * bits[1] + Number(bits[2]); return scale * bits[1] + Number(bits[2]);
}] }]
]; ];
@ -1617,7 +1619,7 @@ GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource
if (this.resolveID(currentLocation).get('type') == 'commit') { if (this.resolveID(currentLocation).get('type') == 'commit') {
// we referenced a commit like git rebase C2 C1, so we have // we referenced a commit like git rebase C2 C1, so we have
// to manually check out C1' // to manually check out C1'
var steps = animationResponse.rebaseSteps; var steps = animationResponse.rebaseSteps;
var newestCommit = steps[steps.length - 1].newCommit; var newestCommit = steps[steps.length - 1].newCommit;
@ -1770,7 +1772,7 @@ GitEngine.prototype.branchStarter = function() {
} }
if (this.generalArgs.length == 0) { if (this.generalArgs.length === 0) {
this.printBranches(this.getBranches()); this.printBranches(this.getBranches());
return; return;
} }
@ -1856,7 +1858,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
command.set('status', 'processing'); command.set('status', 'processing');
try { try {
var methodName = command.get('method').replace(/-/g, '') + 'Starter'; var methodName = command.get('method').replace(/-/g, '') + 'Starter';
this[methodName](); this[methodName]();
} catch (err) { } catch (err) {
if (err instanceof GitError || if (err instanceof GitError ||
err instanceof CommandResult) { err instanceof CommandResult) {
@ -2445,7 +2447,7 @@ $(document).ready(function(){
ui = new UI(); ui = new UI();
mainVis = new Visuals.Visualization({ mainVis = new Visuals.Visualization({
el: $('#canvasWrapper')[0] el: $('#canvasWrapper')[0]
}); });
if (/\?demo/.test(window.location.href)) { if (/\?demo/.test(window.location.href)) {
@ -2505,7 +2507,7 @@ var VisEdge = Tree.VisEdge;
var Visualization = Backbone.View.extend({ var Visualization = Backbone.View.extend({
initialize: function(options) { initialize: function(options) {
var _this = this; var _this = this;
Raphael(10, 10, 200, 200, function() { new Raphael(10, 10, 200, 200, function() {
// for some reason raphael calls this function with a predefined // for some reason raphael calls this function with a predefined
// context... // context...
@ -2579,7 +2581,7 @@ function GitVisuals(options) {
this.branchCollection.on('add', this.addBranchFromEvent, this); this.branchCollection.on('add', this.addBranchFromEvent, this);
this.branchCollection.on('remove', this.removeBranch, this); this.branchCollection.on('remove', this.removeBranch, this);
this.deferred = []; this.deferred = [];
Main.getEvents().on('refreshTree', _.bind( Main.getEvents().on('refreshTree', _.bind(
this.refreshTree, this this.refreshTree, this
)); ));
@ -2847,7 +2849,7 @@ GitVisuals.prototype.calcBranchStacks = function() {
GitVisuals.prototype.calcWidth = function() { GitVisuals.prototype.calcWidth = function() {
this.maxWidthRecursive(this.rootCommit); this.maxWidthRecursive(this.rootCommit);
this.assignBoundsRecursive(this.rootCommit, 0, 1); this.assignBoundsRecursive(this.rootCommit, 0, 1);
}; };
@ -2872,7 +2874,7 @@ GitVisuals.prototype.assignBoundsRecursive = function(commit, min, max) {
var myWidthPos = (min + max) / 2.0; var myWidthPos = (min + max) / 2.0;
commit.get('visNode').get('pos').x = myWidthPos; commit.get('visNode').get('pos').x = myWidthPos;
if (commit.get('children').length == 0) { if (commit.get('children').length === 0) {
return; return;
} }
@ -3701,7 +3703,7 @@ var randomHueString = function() {
var hue = Math.random(); var hue = Math.random();
var str = 'hsb(' + String(hue) + ',0.7,1)'; var str = 'hsb(' + String(hue) + ',0.7,1)';
return str; return str;
}; };
var VisBase = Backbone.Model.extend({ var VisBase = Backbone.Model.extend({
removeKeys: function(keys) { removeKeys: function(keys) {
@ -3747,10 +3749,6 @@ var VisBranch = VisBase.extend({
} }
}, },
getFill: function() {
return this.get('fill');
},
getID: function() { getID: function() {
return this.get('branch').get('id'); return this.get('branch').get('id');
}, },
@ -3761,7 +3759,7 @@ var VisBranch = VisBase.extend({
// shorthand notation for the main objects // shorthand notation for the main objects
this.gitVisuals = this.get('gitVisuals'); this.gitVisuals = this.get('gitVisuals');
this.gitEngine = this.get('gitEngine'); this.gitEngine = this.get('gitEngine');
if (!this.gitEngine) { if (!this.gitEngine) {
console.log('throw damnit'); console.log('throw damnit');
throw new Error('asd'); throw new Error('asd');
} }
@ -3804,7 +3802,7 @@ var VisBranch = VisBase.extend({
}, },
getBranchStackLength: function() { getBranchStackLength: function() {
if (this.get('isHead')) { if (this.get('isHead')) {
// head is always by itself // head is always by itself
return 1; return 1;
} }
@ -3844,7 +3842,7 @@ var VisBranch = VisBase.extend({
return { return {
x: pos.x - 0.5 * textSize.w - this.get('hPad'), x: pos.x - 0.5 * textSize.w - this.get('hPad'),
y: pos.y - 0.5 * textSize.h - this.get('vPad') y: pos.y - 0.5 * textSize.h - this.get('vPad')
} };
}, },
getArrowPath: function() { getArrowPath: function() {
@ -3973,7 +3971,7 @@ var VisBranch = VisBase.extend({
// - part of a multi branch, but your thing is hidden // - part of a multi branch, but your thing is hidden
if (this.get('isHead') || if (this.get('isHead') ||
this.getBranchStackLength() == 1 || this.getBranchStackLength() == 1 ||
this.getBranchStackIndex() != 0) { this.getBranchStackIndex() !== 0) {
return this.get('fill'); return this.get('fill');
} }
@ -4028,7 +4026,7 @@ var VisBranch = VisBase.extend({
if (this.get('isHead')) { if (this.get('isHead')) {
return this.gitEngine.getDetachedHead() ? 1 : 0; return this.gitEngine.getDetachedHead() ? 1 : 0;
} }
return this.getBranchStackIndex() == 0 ? 1 : 0.0; return this.getBranchStackIndex() === 0 ? 1 : 0.0;
}, },
getTextOpacity: function() { getTextOpacity: function() {
@ -4087,7 +4085,7 @@ var VisBranch = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('text').attr(attr.text); this.get('text').attr(attr.text);
this.get('rect').attr(attr.rect); this.get('rect').attr(attr.rect);
this.get('arrow').attr(attr.arrow); this.get('arrow').attr(attr.arrow);
@ -4162,7 +4160,7 @@ var VisNode = VisBase.extend({
setDepthBasedOn: function(depthIncrement) { setDepthBasedOn: function(depthIncrement) {
if (this.get('depth') === undefined) { if (this.get('depth') === undefined) {
debugger debugger;
throw new Error('no depth yet!'); throw new Error('no depth yet!');
} }
var pos = this.get('pos'); var pos = this.get('pos');
@ -4263,7 +4261,7 @@ var VisNode = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('circle').attr(attr.circle); this.get('circle').attr(attr.circle);
this.get('text').attr(attr.text); this.get('text').attr(attr.text);
return; return;
@ -4302,12 +4300,12 @@ var VisNode = VisBase.extend({
cx: parentCoords.x, cx: parentCoords.x,
cy: parentCoords.y, cy: parentCoords.y,
opacity: 0, opacity: 0,
r: 0, r: 0
}); });
this.get('text').attr({ this.get('text').attr({
x: parentCoords.x, x: parentCoords.x,
y: parentCoords.y, y: parentCoords.y,
opacity: 0, opacity: 0
}); });
}, },
@ -4407,9 +4405,7 @@ var VisNode = VisBase.extend({
} }
// now we need to get branch hues // now we need to get branch hues
return this.gitVisuals.getBlendedHuesForCommit(this.get('commit')); return this.gitVisuals.getBlendedHuesForCommit(this.get('commit'));
return this.get('fill');
}, },
attachClickHandlers: function() { attachClickHandlers: function() {
@ -4632,7 +4628,7 @@ var VisEdge = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('path').attr(attr.path); this.get('path').attr(attr.path);
return; return;
} }
@ -4643,8 +4639,7 @@ var VisEdge = VisBase.extend({
speed !== undefined ? speed : this.get('animationSpeed'), speed !== undefined ? speed : this.get('animationSpeed'),
easing || this.get('animationEasing') easing || this.get('animationEasing')
); );
}, }
}); });
var VisEdgeCollection = Backbone.Collection.extend({ var VisEdgeCollection = Backbone.Collection.extend({
@ -5133,11 +5128,10 @@ require.define("/miscViews.js",function(require,module,exports,__dirname,__filen
} }
}, this); }, this);
this.rebaseCallback(toRebase); this.rebaseCallback(toRebase);
this.$el.html(''); this.$el.html('');
// kill ourselves? // garbage collection will get us
delete this;
}, },
render: function() { render: function() {
@ -5161,8 +5155,7 @@ require.define("/miscViews.js",function(require,module,exports,__dirname,__filen
distance: 5, distance: 5,
placeholder: 'ui-state-highlight' placeholder: 'ui-state-highlight'
}); });
}, }
}); });
var RebaseEntry = Backbone.Model.extend({ var RebaseEntry = Backbone.Model.extend({
@ -5185,7 +5178,7 @@ var RebaseEntryView = Backbone.View.extend({
toggle: function() { toggle: function() {
this.model.toggle(); this.model.toggle();
// toggle a class also // toggle a class also
this.listEntry.toggleClass('notPicked', !this.model.get('pick')); this.listEntry.toggleClass('notPicked', !this.model.get('pick'));
}, },
@ -6909,7 +6902,7 @@ GitEngine.prototype.getDetachedHead = function() {
}; };
GitEngine.prototype.validateBranchName = function(name) { GitEngine.prototype.validateBranchName = function(name) {
name = name.replace(/\s/g, ''); name = name.replace(/\s/g, '');
if (!/^[a-zA-Z0-9]+$/.test(name)) { if (!/^[a-zA-Z0-9]+$/.test(name)) {
throw new GitError({ throw new GitError({
msg: 'woah bad branch name!! This is not ok: ' + name msg: 'woah bad branch name!! This is not ok: ' + name
@ -7040,7 +7033,7 @@ GitEngine.prototype.validateArgBounds = function(args, lower, upper, option) {
GitEngine.prototype.oneArgImpliedHead = function(args, option) { GitEngine.prototype.oneArgImpliedHead = function(args, option) {
// for log, show, etc // for log, show, etc
this.validateArgBounds(args, 0, 1, option); this.validateArgBounds(args, 0, 1, option);
if (args.length == 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
} }
}; };
@ -7078,7 +7071,7 @@ GitEngine.prototype.revert = function(whichCommits) {
animationResponse.toRebaseArray = toRebase.slice(0); animationResponse.toRebaseArray = toRebase.slice(0);
animationResponse.rebaseSteps = []; animationResponse.rebaseSteps = [];
beforeSnapshot = this.gitVisuals.genSnapshot(); var beforeSnapshot = this.gitVisuals.genSnapshot();
var afterSnapshot; var afterSnapshot;
// now make a bunch of commits on top of where we are // now make a bunch of commits on top of where we are
@ -7179,22 +7172,23 @@ GitEngine.prototype.commitStarter = function() {
} }
var msg = null; var msg = null;
var args = null;
if (this.commandOptions['-a']) { if (this.commandOptions['-a']) {
this.command.addWarning('No need to add files in this demo'); this.command.addWarning('No need to add files in this demo');
} }
if (this.commandOptions['-am']) { if (this.commandOptions['-am']) {
var args = this.commandOptions['-am']; args = this.commandOptions['-am'];
this.validateArgBounds(args, 1, 1, '-am'); this.validateArgBounds(args, 1, 1, '-am');
this.command.addWarning("Don't worry about adding files in this demo. I'll take " + this.command.addWarning("Don't worry about adding files in this demo. I'll take " +
"down your commit message anyways, but you can commit without a message " + "down your commit message anyways, but you can commit without a message " +
"in this demo as well"); "in this demo as well");
msg = args[0]; msg = args[0];
} }
if (this.commandOptions['-m']) { if (this.commandOptions['-m']) {
var args = this.commandOptions['-m']; args = this.commandOptions['-m'];
this.validateArgBounds(args, 1, 1, '-m'); this.validateArgBounds(args, 1, 1, '-m');
msg = args[0]; msg = args[0];
} }
@ -7213,7 +7207,7 @@ GitEngine.prototype.commitStarter = function() {
GitEngine.prototype.commit = function() { GitEngine.prototype.commit = function() {
var targetCommit = this.getCommitFromRef(this.HEAD); var targetCommit = this.getCommitFromRef(this.HEAD);
var id = undefined; var id = null;
// if we want to ammend, go one above // if we want to ammend, go one above
if (this.commandOptions['--amend']) { if (this.commandOptions['--amend']) {
@ -7262,7 +7256,7 @@ GitEngine.prototype.resolveStringRef = function(ref) {
// may be something like HEAD~2 or master^^ // may be something like HEAD~2 or master^^
var relativeRefs = [ var relativeRefs = [
[/^([a-zA-Z0-9]+)~(\d+)\s*$/, function(matches) { [/^([a-zA-Z0-9]+)~(\d+)\s*$/, function(matches) {
return parseInt(matches[2]); return parseInt(matches[2], 10);
}], }],
[/^([a-zA-Z0-9]+)(\^+)\s*$/, function(matches) { [/^([a-zA-Z0-9]+)(\^+)\s*$/, function(matches) {
return matches[2].length; return matches[2].length;
@ -7319,7 +7313,7 @@ GitEngine.prototype.setTargetLocation = function(ref, target) {
// sets whatever ref is (branch, HEAD, etc) to a target. so if // sets whatever ref is (branch, HEAD, etc) to a target. so if
// you pass in HEAD, and HEAD is pointing to a branch, it will update // you pass in HEAD, and HEAD is pointing to a branch, it will update
// the branch to that commit, not the HEAD // the branch to that commit, not the HEAD
var ref = this.getOneBeforeCommit(ref); ref = this.getOneBeforeCommit(ref);
ref.set('target', target); ref.set('target', target);
}; };
@ -7404,7 +7398,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
// //
// hence we need to do a BFS search, with the commit date being the // hence we need to do a BFS search, with the commit date being the
// value to sort off of (rather than just purely the level) // value to sort off of (rather than just purely the level)
if (numBack == 0) { if (numBack === 0) {
return commit; return commit;
} }
@ -7431,7 +7425,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
numBack--; numBack--;
} }
if (numBack !== 0 || pQueue.length == 0) { if (numBack !== 0 || pQueue.length === 0) {
throw new GitError({ throw new GitError({
msg: "Sorry, I can't go that many commits back" msg: "Sorry, I can't go that many commits back"
}); });
@ -7461,7 +7455,7 @@ GitEngine.prototype.rebaseAltID = function(id) {
// here we switch from C''' to C'^4 // here we switch from C''' to C'^4
return bits[0].slice(0, -3) + "'^4"; return bits[0].slice(0, -3) + "'^4";
}], }],
[/^C(\d+)['][^](\d+)$/, function(bits) { [/^C(\d+)['][\^](\d+)$/, function(bits) {
return 'C' + String(bits[1]) + "'^" + String(Number(bits[2]) + 1); return 'C' + String(bits[1]) + "'^" + String(Number(bits[2]) + 1);
}] }]
]; ];
@ -7501,7 +7495,7 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
// return the 4 from C4, plus the length of the quotes // return the 4 from C4, plus the length of the quotes
return scale * bits[1] + bits[2].length; return scale * bits[1] + bits[2].length;
}], }],
[/^C(\d+)['][^](\d+)$/, function(bits) { [/^C(\d+)['][\^](\d+)$/, function(bits) {
return scale * bits[1] + Number(bits[2]); return scale * bits[1] + Number(bits[2]);
}] }]
]; ];
@ -7740,7 +7734,7 @@ GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource
if (this.resolveID(currentLocation).get('type') == 'commit') { if (this.resolveID(currentLocation).get('type') == 'commit') {
// we referenced a commit like git rebase C2 C1, so we have // we referenced a commit like git rebase C2 C1, so we have
// to manually check out C1' // to manually check out C1'
var steps = animationResponse.rebaseSteps; var steps = animationResponse.rebaseSteps;
var newestCommit = steps[steps.length - 1].newCommit; var newestCommit = steps[steps.length - 1].newCommit;
@ -7893,7 +7887,7 @@ GitEngine.prototype.branchStarter = function() {
} }
if (this.generalArgs.length == 0) { if (this.generalArgs.length === 0) {
this.printBranches(this.getBranches()); this.printBranches(this.getBranches());
return; return;
} }
@ -7979,7 +7973,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
command.set('status', 'processing'); command.set('status', 'processing');
try { try {
var methodName = command.get('method').replace(/-/g, '') + 'Starter'; var methodName = command.get('method').replace(/-/g, '') + 'Starter';
this[methodName](); this[methodName]();
} catch (err) { } catch (err) {
if (err instanceof GitError || if (err instanceof GitError ||
err instanceof CommandResult) { err instanceof CommandResult) {
@ -8403,7 +8397,7 @@ $(document).ready(function(){
ui = new UI(); ui = new UI();
mainVis = new Visuals.Visualization({ mainVis = new Visuals.Visualization({
el: $('#canvasWrapper')[0] el: $('#canvasWrapper')[0]
}); });
if (/\?demo/.test(window.location.href)) { if (/\?demo/.test(window.location.href)) {
@ -8519,11 +8513,10 @@ require.define("/miscViews.js",function(require,module,exports,__dirname,__filen
} }
}, this); }, this);
this.rebaseCallback(toRebase); this.rebaseCallback(toRebase);
this.$el.html(''); this.$el.html('');
// kill ourselves? // garbage collection will get us
delete this;
}, },
render: function() { render: function() {
@ -8547,8 +8540,7 @@ require.define("/miscViews.js",function(require,module,exports,__dirname,__filen
distance: 5, distance: 5,
placeholder: 'ui-state-highlight' placeholder: 'ui-state-highlight'
}); });
}, }
}); });
var RebaseEntry = Backbone.Model.extend({ var RebaseEntry = Backbone.Model.extend({
@ -8571,7 +8563,7 @@ var RebaseEntryView = Backbone.View.extend({
toggle: function() { toggle: function() {
this.model.toggle(); this.model.toggle();
// toggle a class also // toggle a class also
this.listEntry.toggleClass('notPicked', !this.model.get('pick')); this.listEntry.toggleClass('notPicked', !this.model.get('pick'));
}, },
@ -8606,7 +8598,7 @@ var randomHueString = function() {
var hue = Math.random(); var hue = Math.random();
var str = 'hsb(' + String(hue) + ',0.7,1)'; var str = 'hsb(' + String(hue) + ',0.7,1)';
return str; return str;
}; };
var VisBase = Backbone.Model.extend({ var VisBase = Backbone.Model.extend({
removeKeys: function(keys) { removeKeys: function(keys) {
@ -8652,10 +8644,6 @@ var VisBranch = VisBase.extend({
} }
}, },
getFill: function() {
return this.get('fill');
},
getID: function() { getID: function() {
return this.get('branch').get('id'); return this.get('branch').get('id');
}, },
@ -8666,7 +8654,7 @@ var VisBranch = VisBase.extend({
// shorthand notation for the main objects // shorthand notation for the main objects
this.gitVisuals = this.get('gitVisuals'); this.gitVisuals = this.get('gitVisuals');
this.gitEngine = this.get('gitEngine'); this.gitEngine = this.get('gitEngine');
if (!this.gitEngine) { if (!this.gitEngine) {
console.log('throw damnit'); console.log('throw damnit');
throw new Error('asd'); throw new Error('asd');
} }
@ -8709,7 +8697,7 @@ var VisBranch = VisBase.extend({
}, },
getBranchStackLength: function() { getBranchStackLength: function() {
if (this.get('isHead')) { if (this.get('isHead')) {
// head is always by itself // head is always by itself
return 1; return 1;
} }
@ -8749,7 +8737,7 @@ var VisBranch = VisBase.extend({
return { return {
x: pos.x - 0.5 * textSize.w - this.get('hPad'), x: pos.x - 0.5 * textSize.w - this.get('hPad'),
y: pos.y - 0.5 * textSize.h - this.get('vPad') y: pos.y - 0.5 * textSize.h - this.get('vPad')
} };
}, },
getArrowPath: function() { getArrowPath: function() {
@ -8878,7 +8866,7 @@ var VisBranch = VisBase.extend({
// - part of a multi branch, but your thing is hidden // - part of a multi branch, but your thing is hidden
if (this.get('isHead') || if (this.get('isHead') ||
this.getBranchStackLength() == 1 || this.getBranchStackLength() == 1 ||
this.getBranchStackIndex() != 0) { this.getBranchStackIndex() !== 0) {
return this.get('fill'); return this.get('fill');
} }
@ -8933,7 +8921,7 @@ var VisBranch = VisBase.extend({
if (this.get('isHead')) { if (this.get('isHead')) {
return this.gitEngine.getDetachedHead() ? 1 : 0; return this.gitEngine.getDetachedHead() ? 1 : 0;
} }
return this.getBranchStackIndex() == 0 ? 1 : 0.0; return this.getBranchStackIndex() === 0 ? 1 : 0.0;
}, },
getTextOpacity: function() { getTextOpacity: function() {
@ -8992,7 +8980,7 @@ var VisBranch = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('text').attr(attr.text); this.get('text').attr(attr.text);
this.get('rect').attr(attr.rect); this.get('rect').attr(attr.rect);
this.get('arrow').attr(attr.arrow); this.get('arrow').attr(attr.arrow);
@ -9067,7 +9055,7 @@ var VisNode = VisBase.extend({
setDepthBasedOn: function(depthIncrement) { setDepthBasedOn: function(depthIncrement) {
if (this.get('depth') === undefined) { if (this.get('depth') === undefined) {
debugger debugger;
throw new Error('no depth yet!'); throw new Error('no depth yet!');
} }
var pos = this.get('pos'); var pos = this.get('pos');
@ -9168,7 +9156,7 @@ var VisNode = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('circle').attr(attr.circle); this.get('circle').attr(attr.circle);
this.get('text').attr(attr.text); this.get('text').attr(attr.text);
return; return;
@ -9207,12 +9195,12 @@ var VisNode = VisBase.extend({
cx: parentCoords.x, cx: parentCoords.x,
cy: parentCoords.y, cy: parentCoords.y,
opacity: 0, opacity: 0,
r: 0, r: 0
}); });
this.get('text').attr({ this.get('text').attr({
x: parentCoords.x, x: parentCoords.x,
y: parentCoords.y, y: parentCoords.y,
opacity: 0, opacity: 0
}); });
}, },
@ -9312,9 +9300,7 @@ var VisNode = VisBase.extend({
} }
// now we need to get branch hues // now we need to get branch hues
return this.gitVisuals.getBlendedHuesForCommit(this.get('commit')); return this.gitVisuals.getBlendedHuesForCommit(this.get('commit'));
return this.get('fill');
}, },
attachClickHandlers: function() { attachClickHandlers: function() {
@ -9537,7 +9523,7 @@ var VisEdge = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('path').attr(attr.path); this.get('path').attr(attr.path);
return; return;
} }
@ -9548,8 +9534,7 @@ var VisEdge = VisBase.extend({
speed !== undefined ? speed : this.get('animationSpeed'), speed !== undefined ? speed : this.get('animationSpeed'),
easing || this.get('animationEasing') easing || this.get('animationEasing')
); );
}, }
}); });
var VisEdgeCollection = Backbone.Collection.extend({ var VisEdgeCollection = Backbone.Collection.extend({
@ -9588,7 +9573,7 @@ var VisEdge = Tree.VisEdge;
var Visualization = Backbone.View.extend({ var Visualization = Backbone.View.extend({
initialize: function(options) { initialize: function(options) {
var _this = this; var _this = this;
Raphael(10, 10, 200, 200, function() { new Raphael(10, 10, 200, 200, function() {
// for some reason raphael calls this function with a predefined // for some reason raphael calls this function with a predefined
// context... // context...
@ -9662,7 +9647,7 @@ function GitVisuals(options) {
this.branchCollection.on('add', this.addBranchFromEvent, this); this.branchCollection.on('add', this.addBranchFromEvent, this);
this.branchCollection.on('remove', this.removeBranch, this); this.branchCollection.on('remove', this.removeBranch, this);
this.deferred = []; this.deferred = [];
Main.getEvents().on('refreshTree', _.bind( Main.getEvents().on('refreshTree', _.bind(
this.refreshTree, this this.refreshTree, this
)); ));
@ -9930,7 +9915,7 @@ GitVisuals.prototype.calcBranchStacks = function() {
GitVisuals.prototype.calcWidth = function() { GitVisuals.prototype.calcWidth = function() {
this.maxWidthRecursive(this.rootCommit); this.maxWidthRecursive(this.rootCommit);
this.assignBoundsRecursive(this.rootCommit, 0, 1); this.assignBoundsRecursive(this.rootCommit, 0, 1);
}; };
@ -9955,7 +9940,7 @@ GitVisuals.prototype.assignBoundsRecursive = function(commit, min, max) {
var myWidthPos = (min + max) / 2.0; var myWidthPos = (min + max) / 2.0;
commit.get('visNode').get('pos').x = myWidthPos; commit.get('visNode').get('pos').x = myWidthPos;
if (commit.get('children').length == 0) { if (commit.get('children').length === 0) {
return; return;
} }
@ -10252,4 +10237,5 @@ exports.Visualization = Visualization;
}); });
require("/visuals.js"); require("/visuals.js");
})(); })();

61
grunt.js
View file

@ -1,45 +1,68 @@
/*global module:false*/ /*global module:false*/
module.exports = function(grunt) { module.exports = function(grunt) {
// eventually have sound...? // eventually have sound...?
grunt.registerTask('compliment', function() { grunt.registerTask('compliment', 'Stay motivated!', function() {
grunt.log.writeln('You are awesome!'); var defaults = ['Awesome!!'];
var compliments = grunt.config('compliment.compliments') || defaults;
var index = Math.floor(Math.random() * compliments.length);
grunt.log.writeln(compliments[index]);
}); });
grunt.initConfig({ grunt.initConfig({
lint: { lint: {
files: ['grunt.js', 'src/*.js'] files: ['grunt.js', 'src/*.js']
}, },
compliment: {
compliments: [
"Wow peter great work!",
"Such a professional dev environment",
"Can't stop the TRAIN",
"git raging"
]
},
/* /*
jasmine_node: { jasmine_node: {
specNameMatcher: "./spec", // load only specs containing specNameMatcher specNameMatcher: './spec', // load only specs containing specNameMatcher
projectRoot: ".", projectRoot: '.',
requirejs: false, requirejs: false,
forceExit: true, forceExit: true,
jUnit: { jUnit: {
report: false, report: false,
savePath : "./build/reports/jasmine/", savePath : './build/reports/jasmine/',
useDotNotation: true, useDotNotation: true,
consolidate: true consolidate: true
} }
}, },
*/
watch: { watch: {
files: '<config:lint.files>', files: '<config:lint.files>',
tasks: 'lint' tasks: 'default'
},*/ },
jshint: { jshint: {
options: { options: {
curly: true, curly: true,
eqeqeq: true, // sometimes triple equality is just redundant and unnecessary
eqeqeq: false,
regexp: false,
immed: true, immed: true,
latedef: true, latedef: false,
nonew: false,
newcap: true, newcap: true,
noarg: true, noarg: true,
bitwise: true,
sub: true, sub: true,
undef: true, undef: true,
unused: false,
trailing: true,
devel: true,
jquery: true,
nonstandard: true,
boss: true, boss: true,
eqnull: true, eqnull: true,
browser: true browser: true,
debug: true
}, },
globals: { globals: {
_: true, _: true,
@ -53,12 +76,26 @@ module.exports = function(grunt) {
it: true, it: true,
exports: true exports: true
} }
},
browserify: {
'build/bundle.js': {
//requires: ['traverse'],
// aliases: ['jquery:jquery-browserify'],
entries: ['src/*.js'],
//prepend: ['<banner:meta.banner>'],
append: [],
/*hook: function (bundle) {
// Do something with bundle
}*/
}
} }
}); });
//grunt.loadNpmTasks('grunt-jasmine-node'); //grunt.loadNpmTasks('grunt-jasmine-node');
grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-jslint');
// Default task. // Default task.
grunt.registerTask('default', 'lint compliment'); //jasmine_node'); grunt.registerTask('default', 'browserify compliment'); //jasmine_node');
}; };

5
package.json
View file

@ -4,6 +4,9 @@
"devDependencies": { "devDependencies": {
"grunt": "latest", "grunt": "latest",
"browserify": "latest" "browserify": "latest"
},
"dependencies": {
"grunt-browserify": "~0.1.2",
"grunt-jslint": "~0.2.2-1"
} }
} }

61
src/git.js
View file

@ -256,7 +256,7 @@ GitEngine.prototype.getDetachedHead = function() {
}; };
GitEngine.prototype.validateBranchName = function(name) { GitEngine.prototype.validateBranchName = function(name) {
name = name.replace(/\s/g, ''); name = name.replace(/\s/g, '');
if (!/^[a-zA-Z0-9]+$/.test(name)) { if (!/^[a-zA-Z0-9]+$/.test(name)) {
throw new GitError({ throw new GitError({
msg: 'woah bad branch name!! This is not ok: ' + name msg: 'woah bad branch name!! This is not ok: ' + name
@ -387,7 +387,7 @@ GitEngine.prototype.validateArgBounds = function(args, lower, upper, option) {
GitEngine.prototype.oneArgImpliedHead = function(args, option) { GitEngine.prototype.oneArgImpliedHead = function(args, option) {
// for log, show, etc // for log, show, etc
this.validateArgBounds(args, 0, 1, option); this.validateArgBounds(args, 0, 1, option);
if (args.length == 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
} }
}; };
@ -425,7 +425,7 @@ GitEngine.prototype.revert = function(whichCommits) {
animationResponse.toRebaseArray = toRebase.slice(0); animationResponse.toRebaseArray = toRebase.slice(0);
animationResponse.rebaseSteps = []; animationResponse.rebaseSteps = [];
beforeSnapshot = this.gitVisuals.genSnapshot(); var beforeSnapshot = this.gitVisuals.genSnapshot();
var afterSnapshot; var afterSnapshot;
// now make a bunch of commits on top of where we are // now make a bunch of commits on top of where we are
@ -526,22 +526,23 @@ GitEngine.prototype.commitStarter = function() {
} }
var msg = null; var msg = null;
var args = null;
if (this.commandOptions['-a']) { if (this.commandOptions['-a']) {
this.command.addWarning('No need to add files in this demo'); this.command.addWarning('No need to add files in this demo');
} }
if (this.commandOptions['-am']) { if (this.commandOptions['-am']) {
var args = this.commandOptions['-am']; args = this.commandOptions['-am'];
this.validateArgBounds(args, 1, 1, '-am'); this.validateArgBounds(args, 1, 1, '-am');
this.command.addWarning("Don't worry about adding files in this demo. I'll take " + this.command.addWarning("Don't worry about adding files in this demo. I'll take " +
"down your commit message anyways, but you can commit without a message " + "down your commit message anyways, but you can commit without a message " +
"in this demo as well"); "in this demo as well");
msg = args[0]; msg = args[0];
} }
if (this.commandOptions['-m']) { if (this.commandOptions['-m']) {
var args = this.commandOptions['-m']; args = this.commandOptions['-m'];
this.validateArgBounds(args, 1, 1, '-m'); this.validateArgBounds(args, 1, 1, '-m');
msg = args[0]; msg = args[0];
} }
@ -560,7 +561,7 @@ GitEngine.prototype.commitStarter = function() {
GitEngine.prototype.commit = function() { GitEngine.prototype.commit = function() {
var targetCommit = this.getCommitFromRef(this.HEAD); var targetCommit = this.getCommitFromRef(this.HEAD);
var id = undefined; var id = null;
// if we want to ammend, go one above // if we want to ammend, go one above
if (this.commandOptions['--amend']) { if (this.commandOptions['--amend']) {
@ -609,7 +610,7 @@ GitEngine.prototype.resolveStringRef = function(ref) {
// may be something like HEAD~2 or master^^ // may be something like HEAD~2 or master^^
var relativeRefs = [ var relativeRefs = [
[/^([a-zA-Z0-9]+)~(\d+)\s*$/, function(matches) { [/^([a-zA-Z0-9]+)~(\d+)\s*$/, function(matches) {
return parseInt(matches[2]); return parseInt(matches[2], 10);
}], }],
[/^([a-zA-Z0-9]+)(\^+)\s*$/, function(matches) { [/^([a-zA-Z0-9]+)(\^+)\s*$/, function(matches) {
return matches[2].length; return matches[2].length;
@ -666,7 +667,7 @@ GitEngine.prototype.setTargetLocation = function(ref, target) {
// sets whatever ref is (branch, HEAD, etc) to a target. so if // sets whatever ref is (branch, HEAD, etc) to a target. so if
// you pass in HEAD, and HEAD is pointing to a branch, it will update // you pass in HEAD, and HEAD is pointing to a branch, it will update
// the branch to that commit, not the HEAD // the branch to that commit, not the HEAD
var ref = this.getOneBeforeCommit(ref); ref = this.getOneBeforeCommit(ref);
ref.set('target', target); ref.set('target', target);
}; };
@ -751,7 +752,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
// //
// hence we need to do a BFS search, with the commit date being the // hence we need to do a BFS search, with the commit date being the
// value to sort off of (rather than just purely the level) // value to sort off of (rather than just purely the level)
if (numBack == 0) { if (numBack === 0) {
return commit; return commit;
} }
@ -778,7 +779,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
numBack--; numBack--;
} }
if (numBack !== 0 || pQueue.length == 0) { if (numBack !== 0 || pQueue.length === 0) {
throw new GitError({ throw new GitError({
msg: "Sorry, I can't go that many commits back" msg: "Sorry, I can't go that many commits back"
}); });
@ -808,7 +809,7 @@ GitEngine.prototype.rebaseAltID = function(id) {
// here we switch from C''' to C'^4 // here we switch from C''' to C'^4
return bits[0].slice(0, -3) + "'^4"; return bits[0].slice(0, -3) + "'^4";
}], }],
[/^C(\d+)['][^](\d+)$/, function(bits) { [/^C(\d+)['][\^](\d+)$/, function(bits) {
return 'C' + String(bits[1]) + "'^" + String(Number(bits[2]) + 1); return 'C' + String(bits[1]) + "'^" + String(Number(bits[2]) + 1);
}] }]
]; ];
@ -848,7 +849,7 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
// return the 4 from C4, plus the length of the quotes // return the 4 from C4, plus the length of the quotes
return scale * bits[1] + bits[2].length; return scale * bits[1] + bits[2].length;
}], }],
[/^C(\d+)['][^](\d+)$/, function(bits) { [/^C(\d+)['][\^](\d+)$/, function(bits) {
return scale * bits[1] + Number(bits[2]); return scale * bits[1] + Number(bits[2]);
}] }]
]; ];
@ -863,7 +864,7 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
} }
} }
throw new Error('Could not parse commit ID ' + id); throw new Error('Could not parse commit ID ' + id);
} };
return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id')); return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id'));
}; };
@ -924,7 +925,7 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// then we BFS from currentLocation, using the downstream set as our stopping point. // then we BFS from currentLocation, using the downstream set as our stopping point.
// we need to BFS because we need to include all commits below // we need to BFS because we need to include all commits below
// pop these commits on top of targetSource and modify their ids with quotes // pop these commits on top of targetSource and modify their ids with quotes
var stopSet = this.getUpstreamSet(targetSource) var stopSet = this.getUpstreamSet(targetSource);
// now BFS from here on out // now BFS from here on out
var toRebaseRough = []; var toRebaseRough = [];
@ -1087,7 +1088,7 @@ GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource
if (this.resolveID(currentLocation).get('type') == 'commit') { if (this.resolveID(currentLocation).get('type') == 'commit') {
// we referenced a commit like git rebase C2 C1, so we have // we referenced a commit like git rebase C2 C1, so we have
// to manually check out C1' // to manually check out C1'
var steps = animationResponse.rebaseSteps; var steps = animationResponse.rebaseSteps;
var newestCommit = steps[steps.length - 1].newCommit; var newestCommit = steps[steps.length - 1].newCommit;
@ -1151,14 +1152,15 @@ GitEngine.prototype.merge = function(targetSource, currentLocation) {
} }
); );
this.setTargetLocation(currentLocation, mergeCommit) this.setTargetLocation(currentLocation, mergeCommit);
return mergeCommit; return mergeCommit;
}; };
GitEngine.prototype.checkoutStarter = function() { GitEngine.prototype.checkoutStarter = function() {
var args = null;
if (this.commandOptions['-b']) { if (this.commandOptions['-b']) {
// the user is really trying to just make a branch and then switch to it. so first: // the user is really trying to just make a branch and then switch to it. so first:
var args = this.commandOptions['-b']; args = this.commandOptions['-b'];
this.twoArgsImpliedHead(args, '-b'); this.twoArgsImpliedHead(args, '-b');
var validId = this.validateBranchName(args[0]); var validId = this.validateBranchName(args[0]);
@ -1180,7 +1182,7 @@ GitEngine.prototype.checkoutStarter = function() {
} }
if (this.commandOptions['-B']) { if (this.commandOptions['-B']) {
var args = this.commandOptions['-B']; args = this.commandOptions['-B'];
this.twoArgsImpliedHead(args, '-B'); this.twoArgsImpliedHead(args, '-B');
this.forceBranch(args[0], args[1]); this.forceBranch(args[0], args[1]);
@ -1240,7 +1242,7 @@ GitEngine.prototype.branchStarter = function() {
} }
if (this.generalArgs.length == 0) { if (this.generalArgs.length === 0) {
this.printBranches(this.getBranches()); this.printBranches(this.getBranches());
return; return;
} }
@ -1305,7 +1307,7 @@ GitEngine.prototype.deleteBranch = function(name) {
GitEngine.prototype.unescapeQuotes = function(str) { GitEngine.prototype.unescapeQuotes = function(str) {
return str.replace(/&#x27;/g, "'"); return str.replace(/&#x27;/g, "'");
} };
GitEngine.prototype.dispatch = function(command, callback) { GitEngine.prototype.dispatch = function(command, callback) {
// current command, options, and args are stored in the gitEngine // current command, options, and args are stored in the gitEngine
@ -1326,7 +1328,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
command.set('status', 'processing'); command.set('status', 'processing');
try { try {
var methodName = command.get('method').replace(/-/g, '') + 'Starter'; var methodName = command.get('method').replace(/-/g, '') + 'Starter';
this[methodName](); this[methodName]();
} catch (err) { } catch (err) {
if (err instanceof GitError || if (err instanceof GitError ||
err instanceof CommandResult) { err instanceof CommandResult) {
@ -1489,14 +1491,17 @@ GitEngine.prototype.getUpstreamSet = function(ancestor) {
var exploredSet = {}; var exploredSet = {};
exploredSet[ancestorID] = true; exploredSet[ancestorID] = true;
var addToExplored = function(rent) {
exploredSet[rent.get('id')] = true;
queue.push(rent);
};
while (queue.length) { while (queue.length) {
var here = queue.pop(); var here = queue.pop();
var rents = here.get('parents'); var rents = here.get('parents');
_.each(rents, function(rent) { _.each(rents, addToExplored);
exploredSet[rent.get('id')] = true;
queue.push(rent);
});
} }
return exploredSet; return exploredSet;
}; };
@ -1535,7 +1540,7 @@ var Ref = Backbone.Model.extend({
var Branch = Ref.extend({ var Branch = Ref.extend({
defaults: { defaults: {
visBranch: null, visBranch: null
}, },
initialize: function() { initialize: function() {
@ -1583,7 +1588,7 @@ var Commit = Backbone.Model.extend({
'+++ bigGameResults.html', '+++ bigGameResults.html',
'@@ 13,27 @@ Winner, Score', '@@ 13,27 @@ Winner, Score',
'- Stanfurd, 14-7', '- Stanfurd, 14-7',
'+ Cal, 21-14', '+ Cal, 21-14'
].join('\n') + '\n'; ].join('\n') + '\n';
}, },

2
src/main.js
View file

@ -12,7 +12,7 @@ $(document).ready(function(){
ui = new UI(); ui = new UI();
mainVis = new Visuals.Visualization({ mainVis = new Visuals.Visualization({
el: $('#canvasWrapper')[0] el: $('#canvasWrapper')[0]
}); });
if (/\?demo/.test(window.location.href)) { if (/\?demo/.test(window.location.href)) {

10
src/miscViews.js
View file

@ -71,11 +71,10 @@ var InteractiveRebaseView = Backbone.View.extend({
} }
}, this); }, this);
this.rebaseCallback(toRebase); this.rebaseCallback(toRebase);
this.$el.html(''); this.$el.html('');
// kill ourselves? // garbage collection will get us
delete this;
}, },
render: function() { render: function() {
@ -99,8 +98,7 @@ var InteractiveRebaseView = Backbone.View.extend({
distance: 5, distance: 5,
placeholder: 'ui-state-highlight' placeholder: 'ui-state-highlight'
}); });
}, }
}); });
var RebaseEntry = Backbone.Model.extend({ var RebaseEntry = Backbone.Model.extend({
@ -123,7 +121,7 @@ var RebaseEntryView = Backbone.View.extend({
toggle: function() { toggle: function() {
this.model.toggle(); this.model.toggle();
// toggle a class also // toggle a class also
this.listEntry.toggleClass('notPicked', !this.model.get('pick')); this.listEntry.toggleClass('notPicked', !this.model.get('pick'));
}, },

33
src/tree.js
View file

@ -5,7 +5,7 @@ var randomHueString = function() {
var hue = Math.random(); var hue = Math.random();
var str = 'hsb(' + String(hue) + ',0.7,1)'; var str = 'hsb(' + String(hue) + ',0.7,1)';
return str; return str;
}; };
var VisBase = Backbone.Model.extend({ var VisBase = Backbone.Model.extend({
removeKeys: function(keys) { removeKeys: function(keys) {
@ -51,10 +51,6 @@ var VisBranch = VisBase.extend({
} }
}, },
getFill: function() {
return this.get('fill');
},
getID: function() { getID: function() {
return this.get('branch').get('id'); return this.get('branch').get('id');
}, },
@ -65,7 +61,7 @@ var VisBranch = VisBase.extend({
// shorthand notation for the main objects // shorthand notation for the main objects
this.gitVisuals = this.get('gitVisuals'); this.gitVisuals = this.get('gitVisuals');
this.gitEngine = this.get('gitEngine'); this.gitEngine = this.get('gitEngine');
if (!this.gitEngine) { if (!this.gitEngine) {
console.log('throw damnit'); console.log('throw damnit');
throw new Error('asd'); throw new Error('asd');
} }
@ -108,7 +104,7 @@ var VisBranch = VisBase.extend({
}, },
getBranchStackLength: function() { getBranchStackLength: function() {
if (this.get('isHead')) { if (this.get('isHead')) {
// head is always by itself // head is always by itself
return 1; return 1;
} }
@ -148,7 +144,7 @@ var VisBranch = VisBase.extend({
return { return {
x: pos.x - 0.5 * textSize.w - this.get('hPad'), x: pos.x - 0.5 * textSize.w - this.get('hPad'),
y: pos.y - 0.5 * textSize.h - this.get('vPad') y: pos.y - 0.5 * textSize.h - this.get('vPad')
} };
}, },
getArrowPath: function() { getArrowPath: function() {
@ -277,7 +273,7 @@ var VisBranch = VisBase.extend({
// - part of a multi branch, but your thing is hidden // - part of a multi branch, but your thing is hidden
if (this.get('isHead') || if (this.get('isHead') ||
this.getBranchStackLength() == 1 || this.getBranchStackLength() == 1 ||
this.getBranchStackIndex() != 0) { this.getBranchStackIndex() !== 0) {
return this.get('fill'); return this.get('fill');
} }
@ -332,7 +328,7 @@ var VisBranch = VisBase.extend({
if (this.get('isHead')) { if (this.get('isHead')) {
return this.gitEngine.getDetachedHead() ? 1 : 0; return this.gitEngine.getDetachedHead() ? 1 : 0;
} }
return this.getBranchStackIndex() == 0 ? 1 : 0.0; return this.getBranchStackIndex() === 0 ? 1 : 0.0;
}, },
getTextOpacity: function() { getTextOpacity: function() {
@ -391,7 +387,7 @@ var VisBranch = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('text').attr(attr.text); this.get('text').attr(attr.text);
this.get('rect').attr(attr.rect); this.get('rect').attr(attr.rect);
this.get('arrow').attr(attr.arrow); this.get('arrow').attr(attr.arrow);
@ -466,7 +462,7 @@ var VisNode = VisBase.extend({
setDepthBasedOn: function(depthIncrement) { setDepthBasedOn: function(depthIncrement) {
if (this.get('depth') === undefined) { if (this.get('depth') === undefined) {
debugger debugger;
throw new Error('no depth yet!'); throw new Error('no depth yet!');
} }
var pos = this.get('pos'); var pos = this.get('pos');
@ -567,7 +563,7 @@ var VisNode = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('circle').attr(attr.circle); this.get('circle').attr(attr.circle);
this.get('text').attr(attr.text); this.get('text').attr(attr.text);
return; return;
@ -606,12 +602,12 @@ var VisNode = VisBase.extend({
cx: parentCoords.x, cx: parentCoords.x,
cy: parentCoords.y, cy: parentCoords.y,
opacity: 0, opacity: 0,
r: 0, r: 0
}); });
this.get('text').attr({ this.get('text').attr({
x: parentCoords.x, x: parentCoords.x,
y: parentCoords.y, y: parentCoords.y,
opacity: 0, opacity: 0
}); });
}, },
@ -711,9 +707,7 @@ var VisNode = VisBase.extend({
} }
// now we need to get branch hues // now we need to get branch hues
return this.gitVisuals.getBlendedHuesForCommit(this.get('commit')); return this.gitVisuals.getBlendedHuesForCommit(this.get('commit'));
return this.get('fill');
}, },
attachClickHandlers: function() { attachClickHandlers: function() {
@ -936,7 +930,7 @@ var VisEdge = VisBase.extend({
}, },
animateToAttr: function(attr, speed, easing) { animateToAttr: function(attr, speed, easing) {
if (speed == 0) { if (speed === 0) {
this.get('path').attr(attr.path); this.get('path').attr(attr.path);
return; return;
} }
@ -947,8 +941,7 @@ var VisEdge = VisBase.extend({
speed !== undefined ? speed : this.get('animationSpeed'), speed !== undefined ? speed : this.get('animationSpeed'),
easing || this.get('animationEasing') easing || this.get('animationEasing')
); );
}, }
}); });
var VisEdgeCollection = Backbone.Collection.extend({ var VisEdgeCollection = Backbone.Collection.extend({

8
src/visuals.js
View file

@ -16,7 +16,7 @@ var VisEdge = Tree.VisEdge;
var Visualization = Backbone.View.extend({ var Visualization = Backbone.View.extend({
initialize: function(options) { initialize: function(options) {
var _this = this; var _this = this;
Raphael(10, 10, 200, 200, function() { new Raphael(10, 10, 200, 200, function() {
// for some reason raphael calls this function with a predefined // for some reason raphael calls this function with a predefined
// context... // context...
@ -90,7 +90,7 @@ function GitVisuals(options) {
this.branchCollection.on('add', this.addBranchFromEvent, this); this.branchCollection.on('add', this.addBranchFromEvent, this);
this.branchCollection.on('remove', this.removeBranch, this); this.branchCollection.on('remove', this.removeBranch, this);
this.deferred = []; this.deferred = [];
Main.getEvents().on('refreshTree', _.bind( Main.getEvents().on('refreshTree', _.bind(
this.refreshTree, this this.refreshTree, this
)); ));
@ -358,7 +358,7 @@ GitVisuals.prototype.calcBranchStacks = function() {
GitVisuals.prototype.calcWidth = function() { GitVisuals.prototype.calcWidth = function() {
this.maxWidthRecursive(this.rootCommit); this.maxWidthRecursive(this.rootCommit);
this.assignBoundsRecursive(this.rootCommit, 0, 1); this.assignBoundsRecursive(this.rootCommit, 0, 1);
}; };
@ -383,7 +383,7 @@ GitVisuals.prototype.assignBoundsRecursive = function(commit, min, max) {
var myWidthPos = (min + max) / 2.0; var myWidthPos = (min + max) / 2.0;
commit.get('visNode').get('pos').x = myWidthPos; commit.get('visNode').get('pos').x = myWidthPos;
if (commit.get('children').length == 0) { if (commit.get('children').length === 0) {
return; return;
} }