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

no output

Browse source
This commit is contained in:
Peter Cottle 2013-01-11 13:56:45 -08:00
parent 73cead0ae8
commit 13e7385bad
4 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
build/bundle.js
View file

@ -4669,7 +4669,7 @@ var Sandbox = Backbone.View.extend({
showLevels: function(command, deferred) { showLevels: function(command, deferred) {
var whenClosed = Q.defer(); var whenClosed = Q.defer();
Main.getLevelDropdown().show(whenClosed); Main.getLevelDropdown().show(whenClosed, command);
whenClosed.promise.done(function() { whenClosed.promise.done(function() {
command.finishWith(deferred); command.finishWith(deferred);
}); });
@ -6828,7 +6828,7 @@ var Level = Sandbox.extend({
}, },
testOption: function(option) { testOption: function(option) {
return this.options.command && RegExp('--' + option).test(this.options.command.get('rawStr')); return this.options.command && new RegExp('--' + option).test(this.options.command.get('rawStr'));
}, },
levelSolved: function(defer) { levelSolved: function(defer) {
@ -16926,7 +16926,12 @@ var LevelDropdownView = ContainedBase.extend({
this.hide(); this.hide();
}, },
show: function(deferred) { testOption: function(str) {
return this.currentCommand && new RegExp('--' + str).test(this.currentCommand.get('rawStr'));
},
show: function(deferred, command) {
this.currentCommand = command;
// doing the update on show will allow us to fade which will be nice // doing the update on show will allow us to fade which will be nice
this.updateSolvedStatus(); this.updateSolvedStatus();
@ -16947,10 +16952,12 @@ var LevelDropdownView = ContainedBase.extend({
}, },
loadLevelID: function(id) { loadLevelID: function(id) {
Main.getEventBaton().trigger( if (!this.testOption('noOutput')) {
'commandSubmitted', Main.getEventBaton().trigger(
'level ' + id 'commandSubmitted',
); 'level ' + id
);
}
this.hide(); this.hide();
}, },
@ -20850,7 +20857,7 @@ var Level = Sandbox.extend({
}, },
testOption: function(option) { testOption: function(option) {
return this.options.command && RegExp('--' + option).test(this.options.command.get('rawStr')); return this.options.command && new RegExp('--' + option).test(this.options.command.get('rawStr'));
}, },
levelSolved: function(defer) { levelSolved: function(defer) {
@ -21290,7 +21297,7 @@ var Sandbox = Backbone.View.extend({
showLevels: function(command, deferred) { showLevels: function(command, deferred) {
var whenClosed = Q.defer(); var whenClosed = Q.defer();
Main.getLevelDropdown().show(whenClosed); Main.getLevelDropdown().show(whenClosed, command);
whenClosed.promise.done(function() { whenClosed.promise.done(function() {
command.finishWith(deferred); command.finishWith(deferred);
}); });
@ -24098,7 +24105,12 @@ var LevelDropdownView = ContainedBase.extend({
this.hide(); this.hide();
}, },
show: function(deferred) { testOption: function(str) {
return this.currentCommand && new RegExp('--' + str).test(this.currentCommand.get('rawStr'));
},
show: function(deferred, command) {
this.currentCommand = command;
// doing the update on show will allow us to fade which will be nice // doing the update on show will allow us to fade which will be nice
this.updateSolvedStatus(); this.updateSolvedStatus();
@ -24119,10 +24131,12 @@ var LevelDropdownView = ContainedBase.extend({
}, },
loadLevelID: function(id) { loadLevelID: function(id) {
Main.getEventBaton().trigger( if (!this.testOption('noOutput')) {
'commandSubmitted', Main.getEventBaton().trigger(
'level ' + id 'commandSubmitted',
); 'level ' + id
);
}
this.hide(); this.hide();
}, },

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

@ -300,7 +300,7 @@ var Level = Sandbox.extend({
}, },
testOption: function(option) { testOption: function(option) {
return this.options.command && RegExp('--' + option).test(this.options.command.get('rawStr')); return this.options.command && new RegExp('--' + option).test(this.options.command.get('rawStr'));
}, },
levelSolved: function(defer) { levelSolved: function(defer) {

2
src/js/level/sandbox.js
View file

@ -176,7 +176,7 @@ var Sandbox = Backbone.View.extend({
showLevels: function(command, deferred) { showLevels: function(command, deferred) {
var whenClosed = Q.defer(); var whenClosed = Q.defer();
Main.getLevelDropdown().show(whenClosed); Main.getLevelDropdown().show(whenClosed, command);
whenClosed.promise.done(function() { whenClosed.promise.done(function() {
command.finishWith(deferred); command.finishWith(deferred);
}); });

17
src/js/views/levelDropdownView.js
View file

@ -190,7 +190,12 @@ var LevelDropdownView = ContainedBase.extend({
this.hide(); this.hide();
}, },
show: function(deferred) { testOption: function(str) {
return this.currentCommand && new RegExp('--' + str).test(this.currentCommand.get('rawStr'));
},
show: function(deferred, command) {
this.currentCommand = command;
// doing the update on show will allow us to fade which will be nice // doing the update on show will allow us to fade which will be nice
this.updateSolvedStatus(); this.updateSolvedStatus();
@ -211,10 +216,12 @@ var LevelDropdownView = ContainedBase.extend({
}, },
loadLevelID: function(id) { loadLevelID: function(id) {
Main.getEventBaton().trigger( if (!this.testOption('noOutput')) {
'commandSubmitted', Main.getEventBaton().trigger(
'level ' + id 'commandSubmitted',
); 'level ' + id
);
}
this.hide(); this.hide();
}, },