mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-07 21:24:26 +02:00
temporary UNSTABLE since codemod went nuts
This commit is contained in:
parent
2257668f9d
commit
f048f99e7f
14 changed files with 32 additions and 39 deletions
|
@ -316,7 +316,7 @@ var LevelBuilder = Level.extend({
|
|||
]
|
||||
});
|
||||
askForHintView.getPromise()
|
||||
.then(this.defineHint, this))
|
||||
.then(this.defineHint.bind(this))
|
||||
.fail(function() {
|
||||
this.level.hint = {'en_US': ''};
|
||||
}.bind(this))
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
var _ = require('underscore');
|
||||
var intl = require('../intl');
|
||||
|
||||
var Commands = require('../commands');
|
||||
|
@ -25,7 +24,7 @@ DisabledMap.prototype.getInstantCommands = function() {
|
|||
});
|
||||
};
|
||||
|
||||
_.each(this.disabledMap, function(val, disabledCommand) {
|
||||
Object.keys(this.disabledMap).forEach(function(disabledCommand) {
|
||||
// XXX get hold of vcs from disabledMap
|
||||
var vcs = 'git';
|
||||
disabledCommand = disabledCommand.slice(vcs.length + 1);
|
||||
|
@ -35,7 +34,7 @@ DisabledMap.prototype.getInstantCommands = function() {
|
|||
' has no regex matching');
|
||||
}
|
||||
instants.push([gitRegex, onMatch]);
|
||||
});
|
||||
}.bind(this));
|
||||
return instants;
|
||||
};
|
||||
|
||||
|
|
|
@ -368,16 +368,16 @@ var Level = Sandbox.extend({
|
|||
initGitShim: function(options) {
|
||||
// ok we definitely want a shim here
|
||||
this.gitShim = new GitShim({
|
||||
beforeCB: this.beforeCommandCB, this),
|
||||
afterCB: this.afterCommandCB, this),
|
||||
afterDeferHandler: this.afterCommandDefer, this)
|
||||
beforeCB: this.beforeCommandCB.bind(this),
|
||||
afterCB: this.afterCommandCB.bind(this),
|
||||
afterDeferHandler: this.afterCommandDefer.bind(this)
|
||||
});
|
||||
},
|
||||
|
||||
undo: function() {
|
||||
this.gitCommandsIssued.pop();
|
||||
Level.__super__.undo.apply(this, arguments);
|
||||
}.bind(this)
|
||||
}.bind(this),
|
||||
|
||||
afterCommandCB: function(command) {
|
||||
if (command.get('error')) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue