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

Wow! Fix undo button and more origin work

Browse source
This commit is contained in:
Peter Cottle 2013-05-26 17:40:37 -07:00
parent 6641417422
commit 2938c3fb37
6 changed files with 78 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

58
build/bundle.js
View file

@ -6801,21 +6801,38 @@ var Visualization = Backbone.View.extend({
resetFromThisTreeNow: function(treeString) {
this.treeString = treeString;
console.warn('need to figure out this method...');
// do the same but for origin tree string
var oTree = this.getOriginInTreeString(treeString);
if (oTree) {
var oTreeString = this.gitEngine.printTree(oTree);
this.originToo('resetFromThisThreeNow', [oTreeString]);
}
},
getOriginInTreeString: function(treeString) {
var tree = JSON.parse(unescape(treeString));
return tree.originTree;
},
reset: function(tree) {
var treeString = tree || this.treeString;
this.setTreeOpacity(0);
if (this.treeString) {
if (treeString) {
this.gitEngine.loadTreeFromString(treeString);
} else {
this.gitEngine.defaultInit();
}
this.fadeTreeIn();
console.warn('also figure this one out');
this.originToo('reset', arguments);
if (this.originVis) {
if (treeString) {
var oTree = this.getOriginInTreeString(treeString);
this.originToo('reset', [JSON.stringify(oTree)]);
} else {
// easy
this.originToo('reset', arguments);
}
}
},
tearDown: function() {
@ -7128,6 +7145,10 @@ GitEngine.prototype.exportTree = function() {
HEAD.target = HEAD.target.get('id');
totalExport.HEAD = HEAD;
if (this.hasOrigin()) {
totalExport.originTree = this.origin.exportTree();
}
return totalExport;
};
@ -22696,6 +22717,10 @@ GitEngine.prototype.exportTree = function() {
HEAD.target = HEAD.target.get('id');
totalExport.HEAD = HEAD;
if (this.hasOrigin()) {
totalExport.originTree = this.origin.exportTree();
}
return totalExport;
};
@ -33223,21 +33248,38 @@ var Visualization = Backbone.View.extend({
resetFromThisTreeNow: function(treeString) {
this.treeString = treeString;
console.warn('need to figure out this method...');
// do the same but for origin tree string
var oTree = this.getOriginInTreeString(treeString);
if (oTree) {
var oTreeString = this.gitEngine.printTree(oTree);
this.originToo('resetFromThisThreeNow', [oTreeString]);
}
},
getOriginInTreeString: function(treeString) {
var tree = JSON.parse(unescape(treeString));
return tree.originTree;
},
reset: function(tree) {
var treeString = tree || this.treeString;
this.setTreeOpacity(0);
if (this.treeString) {
if (treeString) {
this.gitEngine.loadTreeFromString(treeString);
} else {
this.gitEngine.defaultInit();
}
this.fadeTreeIn();
console.warn('also figure this one out');
this.originToo('reset', arguments);
if (this.originVis) {
if (treeString) {
var oTree = this.getOriginInTreeString(treeString);
this.originToo('reset', [JSON.stringify(oTree)]);
} else {
// easy
this.originToo('reset', arguments);
}
}
},
tearDown: function() {

1
build/bundle.min.a0e5d150.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -426,7 +426,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.js"></script>
<script src="build/bundle.min.a0e5d150.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include

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

@ -126,6 +126,10 @@ GitEngine.prototype.exportTree = function() {
HEAD.target = HEAD.target.get('id');
totalExport.HEAD = HEAD;
if (this.hasOrigin()) {
totalExport.originTree = this.origin.exportTree();
}
return totalExport;
};

25
src/js/visuals/visualization.js
View file

@ -161,21 +161,38 @@ var Visualization = Backbone.View.extend({
resetFromThisTreeNow: function(treeString) {
this.treeString = treeString;
console.warn('need to figure out this method...');
// do the same but for origin tree string
var oTree = this.getOriginInTreeString(treeString);
if (oTree) {
var oTreeString = this.gitEngine.printTree(oTree);
this.originToo('resetFromThisThreeNow', [oTreeString]);
}
},
getOriginInTreeString: function(treeString) {
var tree = JSON.parse(unescape(treeString));
return tree.originTree;
},
reset: function(tree) {
var treeString = tree || this.treeString;
this.setTreeOpacity(0);
if (this.treeString) {
if (treeString) {
this.gitEngine.loadTreeFromString(treeString);
} else {
this.gitEngine.defaultInit();
}
this.fadeTreeIn();
console.warn('also figure this one out');
this.originToo('reset', arguments);
if (this.originVis) {
if (treeString) {
var oTree = this.getOriginInTreeString(treeString);
this.originToo('reset', [JSON.stringify(oTree)]);
} else {
// easy
this.originToo('reset', arguments);
}
}
},
tearDown: function() {