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

Sweet, fixed tests

Browse source
This commit is contained in:
Peter Cottle 2013-01-20 23:42:23 -08:00
parent 05fdff72f5
commit d9050fd854
7 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
build/bundle.js
View file

@ -6585,7 +6585,10 @@ var init = function() {
}
};
$(document).ready(init);
if (require('../util').isBrowser()) {
// this file gets included via node sometimes as well
$(document).ready(init);
}
/**
* the UI method simply bootstraps the command buffer and
@ -13128,6 +13131,12 @@ var ParseWaterfall = function(options) {
};
ParseWaterfall.prototype.initParseWaterfall = function() {
// check for node when testing
if (!require('../util').isBrowser()) {
this.parseWaterfall = [GitCommands.parse];
return;
}
// by deferring the initialization here, we dont require()
// level too early (which barfs our init)
this.parseWaterfall = this.options.parseWaterfall || [
@ -18413,7 +18422,6 @@ HeadlessGit.prototype.sendCommand = function(value) {
var commandObj = new Command({
rawStr: commandStr
});
console.log('dispatching command "', commandStr, '"');
this.gitEngine.dispatch(commandObj, Q.defer());
}, this);
};
@ -18571,7 +18579,10 @@ var init = function() {
}
};
$(document).ready(init);
if (require('../util').isBrowser()) {
// this file gets included via node sometimes as well
$(document).ready(init);
}
/**
* the UI method simply bootstraps the command buffer and
@ -19012,7 +19023,6 @@ HeadlessGit.prototype.sendCommand = function(value) {
var commandObj = new Command({
rawStr: commandStr
});
console.log('dispatching command "', commandStr, '"');
this.gitEngine.dispatch(commandObj, Q.defer());
}, this);
};
@ -21946,6 +21956,12 @@ var ParseWaterfall = function(options) {
};
ParseWaterfall.prototype.initParseWaterfall = function() {
// check for node when testing
if (!require('../util').isBrowser()) {
this.parseWaterfall = [GitCommands.parse];
return;
}
// by deferring the initialization here, we dont require()
// level too early (which barfs our init)
this.parseWaterfall = this.options.parseWaterfall || [