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

Objective and Assignment commands Issue #76 works even in level builder

Browse source
This commit is contained in:
Peter Cottle 2013-03-10 17:50:42 -07:00
parent 63a8d385bf
commit e081c47e31
8 changed files with 154 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/level/builder.js
View file

@ -51,7 +51,7 @@ var LevelBuilder = Level.extend({
};
LevelBuilder.__super__.initialize.apply(this, [options]);
this.startDialog = undefined;
this.startDialogObj = undefined;
this.definedGoal = false;
// we wont be using this stuff, and its to delete to ensure we overwrite all functions that
@ -96,6 +96,21 @@ var LevelBuilder = Level.extend({
);
},
objectiveDialog: function(command, deferred) {
var args = [
command,
deferred,
(this.startDialogObj === undefined) ?
null :
{
startDialog: {
'en_US': this.startDialogObj
}
}
];
LevelBuilder.__super__.objectiveDialog.apply(this, args);
},
initParseWaterfall: function(options) {
LevelBuilder.__super__.initParseWaterfall.apply(this, [options]);
@ -207,12 +222,12 @@ var LevelBuilder = Level.extend({
editDialog: function(command, deferred) {
var whenDoneEditing = Q.defer();
this.currentBuilder = new MultiViewBuilder({
multiViewJSON: this.startDialog,
multiViewJSON: this.startDialogObj,
deferred: whenDoneEditing
});
whenDoneEditing.promise
.then(_.bind(function(levelObj) {
this.startDialog = levelObj;
this.startDialogObj = levelObj;
}, this))
.fail(function() {
// nothing to do, they dont want to edit it apparently
@ -264,7 +279,7 @@ var LevelBuilder = Level.extend({
});
}
if (this.startDialog === undefined) {
if (this.startDialogObj === undefined) {
var askForStartDeferred = Q.defer();
chain = chain.then(function() {
return askForStartDeferred.promise;
@ -310,8 +325,8 @@ var LevelBuilder = Level.extend({
);
// the start dialog now is just our help intro thing
delete compiledLevel.startDialog;
if (this.startDialog) {
compiledLevel.startDialog = {'en_US': this.startDialog};
if (this.startDialogObj) {
compiledLevel.startDialog = {'en_US': this.startDialogObj};
}
return compiledLevel;
},