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

before attempt at flipping

Browse source
This commit is contained in:
Peter Cottle 2013-01-05 22:28:59 -08:00
parent ca33b7ce1b
commit 9460c4b4c6
3 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
build/bundle.js
View file

@ -6717,19 +6717,23 @@ var Level = Sandbox.extend({
}, },
startLevel: function(command, deferred) { startLevel: function(command, deferred) {
command.addWarning( this.exitLevel();
"You are in a level! You can't start a new one before exiting. I'll add the command for you..."
);
command.set('status', 'error');
Main.getSandbox().startLevel(command, deferred);
/*
Main.getEventBaton().trigger('commandSubmitted', Main.getEventBaton().trigger('commandSubmitted',
'delay 3000; exit level; delay 500;' + command.get('rawStr') 'delay 3000; exit level; delay 500;' + command.get('rawStr')
); );
deferred.resolve(); deferred.resolve();*/
}, },
exitLevel: function(command, deferred) { exitLevel: function(command, deferred) {
this.die(); this.die();
if (!command || !deferred) {
return;
}
setTimeout(function() { setTimeout(function() {
command.finishWith(deferred); command.finishWith(deferred);
}, this.getAnimationTime()); }, this.getAnimationTime());
@ -18503,19 +18507,23 @@ var Level = Sandbox.extend({
}, },
startLevel: function(command, deferred) { startLevel: function(command, deferred) {
command.addWarning( this.exitLevel();
"You are in a level! You can't start a new one before exiting. I'll add the command for you..."
);
command.set('status', 'error');
Main.getSandbox().startLevel(command, deferred);
/*
Main.getEventBaton().trigger('commandSubmitted', Main.getEventBaton().trigger('commandSubmitted',
'delay 3000; exit level; delay 500;' + command.get('rawStr') 'delay 3000; exit level; delay 500;' + command.get('rawStr')
); );
deferred.resolve(); deferred.resolve();*/
}, },
exitLevel: function(command, deferred) { exitLevel: function(command, deferred) {
this.die(); this.die();
if (!command || !deferred) {
return;
}
setTimeout(function() { setTimeout(function() {
command.finishWith(deferred); command.finishWith(deferred);
}, this.getAnimationTime()); }, this.getAnimationTime());

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

@ -330,19 +330,23 @@ var Level = Sandbox.extend({
}, },
startLevel: function(command, deferred) { startLevel: function(command, deferred) {
command.addWarning( this.exitLevel();
"You are in a level! You can't start a new one before exiting. I'll add the command for you..."
);
command.set('status', 'error');
Main.getSandbox().startLevel(command, deferred);
/*
Main.getEventBaton().trigger('commandSubmitted', Main.getEventBaton().trigger('commandSubmitted',
'delay 3000; exit level; delay 500;' + command.get('rawStr') 'delay 3000; exit level; delay 500;' + command.get('rawStr')
); );
deferred.resolve(); deferred.resolve();*/
}, },
exitLevel: function(command, deferred) { exitLevel: function(command, deferred) {
this.die(); this.die();
if (!command || !deferred) {
return;
}
setTimeout(function() { setTimeout(function() {
command.finishWith(deferred); command.finishWith(deferred);
}, this.getAnimationTime()); }, this.getAnimationTime());

1
todo.txt
View file

@ -9,6 +9,7 @@ Big Graphic things:
Medium things: Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ ] level arbiter (has everything by ID) [ ] level arbiter (has everything by ID)
[ ] flip branches on the sides!! i wonder how to determine...
Small things to implement: Small things to implement:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~