mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 16:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes Issue #36

Browse source
This commit is contained in:
Peter Cottle 2013-02-18 13:48:51 -08:00
parent c90444fe1e
commit 9cf91038c1
7 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
build/bundle.js
View file

@ -6794,8 +6794,6 @@ var Level = Sandbox.extend({
el: options.el || this.getDefaultVisEl(),
treeString: options.level.startTree
});
this.initGoalVisualization();
},
initGoalVisualization: function() {
@ -6813,6 +6811,12 @@ var Level = Sandbox.extend({
});
},
onGoalVisualizationClick: function() {
// we need to destory this entire view whenever it is hidden so the scroll bar
// still works. unfortunately this
delete this.goalCanvasHolder;
},
showSolution: function(command, deferred) {
var toIssue = this.level.solutionCommand;
var issueFunc = function() {
@ -6857,6 +6861,9 @@ var Level = Sandbox.extend({
},
showGoal: function(command, defer) {
if (!this.goalCanvasHolder || !this.goalCanvasHolder.inDom) {
this.initGoalVisualization();
}
this.goalCanvasHolder.slideIn();
if (!command || !defer) { return; }
@ -6866,7 +6873,7 @@ var Level = Sandbox.extend({
},
hideGoal: function(command, defer) {
this.goalCanvasHolder.slideOut();
this.goalCanvasHolder.die();
if (!command || !defer) { return; }
setTimeout(function() {
@ -10580,6 +10587,7 @@ var CanvasTerminalHolder = BaseView.extend({
};
this.render();
this.inDom = true;
if (options.additionalClass) {
this.$el.addClass(options.additionalClass);
@ -10589,14 +10597,16 @@ var CanvasTerminalHolder = BaseView.extend({
getAnimationTime: function() { return 700; },
onClick: function() {
this.slideOut();
this.die();
},
die: function() {
this.slideOut();
this.inDom = false;
setTimeout(_.bind(function() {
this.tearDown();
}, this));
}, this), this.getAnimationTime());
},
slideOut: function() {
@ -21903,8 +21913,6 @@ var Level = Sandbox.extend({
el: options.el || this.getDefaultVisEl(),
treeString: options.level.startTree
});
this.initGoalVisualization();
},
initGoalVisualization: function() {
@ -21922,6 +21930,12 @@ var Level = Sandbox.extend({
});
},
onGoalVisualizationClick: function() {
// we need to destory this entire view whenever it is hidden so the scroll bar
// still works. unfortunately this
delete this.goalCanvasHolder;
},
showSolution: function(command, deferred) {
var toIssue = this.level.solutionCommand;
var issueFunc = function() {
@ -21966,6 +21980,9 @@ var Level = Sandbox.extend({
},
showGoal: function(command, defer) {
if (!this.goalCanvasHolder || !this.goalCanvasHolder.inDom) {
this.initGoalVisualization();
}
this.goalCanvasHolder.slideIn();
if (!command || !defer) { return; }
@ -21975,7 +21992,7 @@ var Level = Sandbox.extend({
},
hideGoal: function(command, defer) {
this.goalCanvasHolder.slideOut();
this.goalCanvasHolder.die();
if (!command || !defer) { return; }
setTimeout(function() {
@ -25277,6 +25294,7 @@ var CanvasTerminalHolder = BaseView.extend({
};
this.render();
this.inDom = true;
if (options.additionalClass) {
this.$el.addClass(options.additionalClass);
@ -25286,14 +25304,16 @@ var CanvasTerminalHolder = BaseView.extend({
getAnimationTime: function() { return 700; },
onClick: function() {
this.slideOut();
this.die();
},
die: function() {
this.slideOut();
this.inDom = false;
setTimeout(_.bind(function() {
this.tearDown();
}, this));
}, this), this.getAnimationTime());
},
slideOut: function() {

1
build/bundle.min.51f92e48.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.f8f2b5dd.js
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -409,7 +409,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.f8f2b5dd.js"></script>
<script src="build/bundle.min.51f92e48.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

13
src/js/level/index.js
View file

@ -134,8 +134,6 @@ var Level = Sandbox.extend({
el: options.el || this.getDefaultVisEl(),
treeString: options.level.startTree
});
this.initGoalVisualization();
},
initGoalVisualization: function() {
@ -153,6 +151,12 @@ var Level = Sandbox.extend({
});
},
onGoalVisualizationClick: function() {
// we need to destory this entire view whenever it is hidden so the scroll bar
// still works. unfortunately this
delete this.goalCanvasHolder;
},
showSolution: function(command, deferred) {
var toIssue = this.level.solutionCommand;
var issueFunc = function() {
@ -197,6 +201,9 @@ var Level = Sandbox.extend({
},
showGoal: function(command, defer) {
if (!this.goalCanvasHolder || !this.goalCanvasHolder.inDom) {
this.initGoalVisualization();
}
this.goalCanvasHolder.slideIn();
if (!command || !defer) { return; }
@ -206,7 +213,7 @@ var Level = Sandbox.extend({
},
hideGoal: function(command, defer) {
this.goalCanvasHolder.slideOut();
this.goalCanvasHolder.die();
if (!command || !defer) { return; }
setTimeout(function() {

7
src/js/views/index.js
View file

@ -593,6 +593,7 @@ var CanvasTerminalHolder = BaseView.extend({
};
this.render();
this.inDom = true;
if (options.additionalClass) {
this.$el.addClass(options.additionalClass);
@ -602,14 +603,16 @@ var CanvasTerminalHolder = BaseView.extend({
getAnimationTime: function() { return 700; },
onClick: function() {
this.slideOut();
this.die();
},
die: function() {
this.slideOut();
this.inDom = false;
setTimeout(_.bind(function() {
this.tearDown();
}, this));
}, this), this.getAnimationTime());
},
slideOut: function() {