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

Move commands/index.js to git/commands.js

Browse source
This commit is contained in:
Siddharth Agarwal 2013-07-30 21:04:50 -07:00
parent 1372a8eead
commit ecbe9cb19a
12 changed files with 1646 additions and 1692 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/level/disabledMap.js
View file

@ -2,7 +2,6 @@ var _ = require('underscore');
var intl = require('../intl');
var GitCommands = require('../git/commands');
var Commands = require('../commands');
var Errors = require('../util/errors');
var GitError = Errors.GitError;
@ -27,7 +26,7 @@ DisabledMap.prototype.getInstantCommands = function() {
};
_.each(this.disabledMap, function(val, disabledCommand) {
var gitRegex = Commands.getRegexMap()[disabledCommand];
var gitRegex = GitCommands.commands.getRegexMap()[disabledCommand];
if (!gitRegex) {
throw new Error('wuttttt this disbaled command' + disabledCommand +
' has no regex matching');

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

@ -10,7 +10,6 @@ var log = require('../log');
var Errors = require('../util/errors');
var Sandbox = require('../level/sandbox').Sandbox;
var Constants = require('../util/constants');
var Commands = require('../commands');
var Visualization = require('../visuals/visualization').Visualization;
var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall;
@ -310,8 +309,8 @@ var Level = Sandbox.extend({
}
var matched = false;
_.each(Commands.getCommandsThatCount(), function(name) {
var regex = Commands.getRegex(name);
_.each(GitCommands.commands.getCommandsThatCount(), function(name) {
var regex = GitCommands.commands.getRegex(name);
matched = matched || regex.test(command.get('rawStr'));
});
if (matched) {

3
src/js/level/parseWaterfall.js
View file

@ -1,7 +1,6 @@
var _ = require('underscore');
var GitCommands = require('../git/commands');
var Commands = require('../commands');
var SandboxCommands = require('../level/sandboxCommands');
// more or less a static class
@ -9,7 +8,7 @@ var ParseWaterfall = function(options) {
options = options || {};
this.options = options;
this.shortcutWaterfall = options.shortcutWaterfall || [
Commands.getShortcutMap()
GitCommands.commands.getShortcutMap()
];
this.instantWaterfall = options.instantWaterfall || [

4
src/js/level/sandboxCommands.js
View file

@ -4,7 +4,7 @@ var util = require('../util');
var constants = require('../util/constants');
var intl = require('../intl');
var Commands = require('../commands');
var GitCommands = require('../git/commands');
var Errors = require('../util/errors');
var CommandProcessError = Errors.CommandProcessError;
var GitError = Errors.GitError;
@ -121,7 +121,7 @@ var getAllCommands = function() {
var allCommands = _.extend(
{},
require('../commands').getRegexMap(),
GitCommands.commands.getRegexMap(),
require('../level').regexMap,
regexMap
);