mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-25 23:48:34 +02:00
Wow! Fix undo button and more origin work
This commit is contained in:
parent
6641417422
commit
2938c3fb37
6 changed files with 78 additions and 13 deletions
|
@ -6801,21 +6801,38 @@ var Visualization = Backbone.View.extend({
|
||||||
|
|
||||||
resetFromThisTreeNow: function(treeString) {
|
resetFromThisTreeNow: function(treeString) {
|
||||||
this.treeString = 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) {
|
reset: function(tree) {
|
||||||
var treeString = tree || this.treeString;
|
var treeString = tree || this.treeString;
|
||||||
this.setTreeOpacity(0);
|
this.setTreeOpacity(0);
|
||||||
if (this.treeString) {
|
if (treeString) {
|
||||||
this.gitEngine.loadTreeFromString(treeString);
|
this.gitEngine.loadTreeFromString(treeString);
|
||||||
} else {
|
} else {
|
||||||
this.gitEngine.defaultInit();
|
this.gitEngine.defaultInit();
|
||||||
}
|
}
|
||||||
this.fadeTreeIn();
|
this.fadeTreeIn();
|
||||||
|
|
||||||
console.warn('also figure this one out');
|
if (this.originVis) {
|
||||||
this.originToo('reset', arguments);
|
if (treeString) {
|
||||||
|
var oTree = this.getOriginInTreeString(treeString);
|
||||||
|
this.originToo('reset', [JSON.stringify(oTree)]);
|
||||||
|
} else {
|
||||||
|
// easy
|
||||||
|
this.originToo('reset', arguments);
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
tearDown: function() {
|
tearDown: function() {
|
||||||
|
@ -7128,6 +7145,10 @@ GitEngine.prototype.exportTree = function() {
|
||||||
HEAD.target = HEAD.target.get('id');
|
HEAD.target = HEAD.target.get('id');
|
||||||
totalExport.HEAD = HEAD;
|
totalExport.HEAD = HEAD;
|
||||||
|
|
||||||
|
if (this.hasOrigin()) {
|
||||||
|
totalExport.originTree = this.origin.exportTree();
|
||||||
|
}
|
||||||
|
|
||||||
return totalExport;
|
return totalExport;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -22696,6 +22717,10 @@ GitEngine.prototype.exportTree = function() {
|
||||||
HEAD.target = HEAD.target.get('id');
|
HEAD.target = HEAD.target.get('id');
|
||||||
totalExport.HEAD = HEAD;
|
totalExport.HEAD = HEAD;
|
||||||
|
|
||||||
|
if (this.hasOrigin()) {
|
||||||
|
totalExport.originTree = this.origin.exportTree();
|
||||||
|
}
|
||||||
|
|
||||||
return totalExport;
|
return totalExport;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -33223,21 +33248,38 @@ var Visualization = Backbone.View.extend({
|
||||||
|
|
||||||
resetFromThisTreeNow: function(treeString) {
|
resetFromThisTreeNow: function(treeString) {
|
||||||
this.treeString = 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) {
|
reset: function(tree) {
|
||||||
var treeString = tree || this.treeString;
|
var treeString = tree || this.treeString;
|
||||||
this.setTreeOpacity(0);
|
this.setTreeOpacity(0);
|
||||||
if (this.treeString) {
|
if (treeString) {
|
||||||
this.gitEngine.loadTreeFromString(treeString);
|
this.gitEngine.loadTreeFromString(treeString);
|
||||||
} else {
|
} else {
|
||||||
this.gitEngine.defaultInit();
|
this.gitEngine.defaultInit();
|
||||||
}
|
}
|
||||||
this.fadeTreeIn();
|
this.fadeTreeIn();
|
||||||
|
|
||||||
console.warn('also figure this one out');
|
if (this.originVis) {
|
||||||
this.originToo('reset', arguments);
|
if (treeString) {
|
||||||
|
var oTree = this.getOriginInTreeString(treeString);
|
||||||
|
this.originToo('reset', [JSON.stringify(oTree)]);
|
||||||
|
} else {
|
||||||
|
// easy
|
||||||
|
this.originToo('reset', arguments);
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
tearDown: function() {
|
tearDown: function() {
|
||||||
|
|
1
build/bundle.min.a0e5d150.js
Normal file
1
build/bundle.min.a0e5d150.js
Normal file
File diff suppressed because one or more lines are too long
1
build/bundle.min.js
vendored
Normal file
1
build/bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -426,7 +426,7 @@
|
||||||
For a much easier time perusing the source, see the individual files at:
|
For a much easier time perusing the source, see the individual files at:
|
||||||
https://github.com/pcottle/learnGitBranching
|
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 advantage of github pages: super-easy, simple, slick static hostic.
|
||||||
The downside? No raw logs to parse for analytics, so I have to include
|
The downside? No raw logs to parse for analytics, so I have to include
|
||||||
|
|
|
@ -126,6 +126,10 @@ GitEngine.prototype.exportTree = function() {
|
||||||
HEAD.target = HEAD.target.get('id');
|
HEAD.target = HEAD.target.get('id');
|
||||||
totalExport.HEAD = HEAD;
|
totalExport.HEAD = HEAD;
|
||||||
|
|
||||||
|
if (this.hasOrigin()) {
|
||||||
|
totalExport.originTree = this.origin.exportTree();
|
||||||
|
}
|
||||||
|
|
||||||
return totalExport;
|
return totalExport;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -161,21 +161,38 @@ var Visualization = Backbone.View.extend({
|
||||||
|
|
||||||
resetFromThisTreeNow: function(treeString) {
|
resetFromThisTreeNow: function(treeString) {
|
||||||
this.treeString = 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) {
|
reset: function(tree) {
|
||||||
var treeString = tree || this.treeString;
|
var treeString = tree || this.treeString;
|
||||||
this.setTreeOpacity(0);
|
this.setTreeOpacity(0);
|
||||||
if (this.treeString) {
|
if (treeString) {
|
||||||
this.gitEngine.loadTreeFromString(treeString);
|
this.gitEngine.loadTreeFromString(treeString);
|
||||||
} else {
|
} else {
|
||||||
this.gitEngine.defaultInit();
|
this.gitEngine.defaultInit();
|
||||||
}
|
}
|
||||||
this.fadeTreeIn();
|
this.fadeTreeIn();
|
||||||
|
|
||||||
console.warn('also figure this one out');
|
if (this.originVis) {
|
||||||
this.originToo('reset', arguments);
|
if (treeString) {
|
||||||
|
var oTree = this.getOriginInTreeString(treeString);
|
||||||
|
this.originToo('reset', [JSON.stringify(oTree)]);
|
||||||
|
} else {
|
||||||
|
// easy
|
||||||
|
this.originToo('reset', arguments);
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
tearDown: function() {
|
tearDown: function() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue