mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-03 19:24:29 +02:00
removed all horrible hack references
This commit is contained in:
parent
3a710c8ab4
commit
b3cf8263a2
12 changed files with 11 additions and 53 deletions
|
@ -1,6 +1,5 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
|
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
|
|
||||||
var intl = require('../intl');
|
var intl = require('../intl');
|
||||||
|
@ -15,7 +14,6 @@ var Main = require('../app');
|
||||||
var Commands = require('../commands');
|
var Commands = require('../commands');
|
||||||
var GitError = Errors.GitError;
|
var GitError = Errors.GitError;
|
||||||
var CommandResult = Errors.CommandResult;
|
var CommandResult = Errors.CommandResult;
|
||||||
var EventBaton = require('../util/eventBaton').EventBaton;
|
|
||||||
|
|
||||||
var ORIGIN_PREFIX = 'o/';
|
var ORIGIN_PREFIX = 'o/';
|
||||||
var TAB = ' ';
|
var TAB = ' ';
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
|
|
||||||
|
|
||||||
var Commit = require('../git').Commit;
|
var Commit = require('../git').Commit;
|
||||||
var Branch = require('../git').Branch;
|
var Branch = require('../git').Branch;
|
||||||
var Tag = require('../git').Tag;
|
var Tag = require('../git').Tag;
|
||||||
|
|
||||||
var Command = require('../models/commandModel').Command;
|
var Command = require('../models/commandModel').Command;
|
||||||
var CommandEntry = require('../models/commandModel').CommandEntry;
|
|
||||||
var TIME = require('../util/constants').TIME;
|
var TIME = require('../util/constants').TIME;
|
||||||
|
|
||||||
var CommitCollection = Backbone.Collection.extend({
|
var CommitCollection = Backbone.Collection.extend({
|
||||||
|
@ -27,11 +25,6 @@ var TagCollection = Backbone.Collection.extend({
|
||||||
model: Tag
|
model: Tag
|
||||||
});
|
});
|
||||||
|
|
||||||
var CommandEntryCollection = Backbone.Collection.extend({
|
|
||||||
model: CommandEntry,
|
|
||||||
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
|
|
||||||
});
|
|
||||||
|
|
||||||
var CommandBuffer = Backbone.Model.extend({
|
var CommandBuffer = Backbone.Model.extend({
|
||||||
defaults: {
|
defaults: {
|
||||||
collection: null
|
collection: null
|
||||||
|
@ -131,6 +124,5 @@ exports.CommitCollection = CommitCollection;
|
||||||
exports.CommandCollection = CommandCollection;
|
exports.CommandCollection = CommandCollection;
|
||||||
exports.BranchCollection = BranchCollection;
|
exports.BranchCollection = BranchCollection;
|
||||||
exports.TagCollection = TagCollection;
|
exports.TagCollection = TagCollection;
|
||||||
exports.CommandEntryCollection = CommandEntryCollection;
|
|
||||||
exports.CommandBuffer = CommandBuffer;
|
exports.CommandBuffer = CommandBuffer;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
|
|
||||||
|
|
||||||
var Errors = require('../util/errors');
|
var Errors = require('../util/errors');
|
||||||
|
|
||||||
|
@ -291,12 +290,4 @@ var Command = Backbone.Model.extend({
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// command entry is for the commandview
|
|
||||||
var CommandEntry = Backbone.Model.extend({
|
|
||||||
defaults: {
|
|
||||||
text: ''
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
exports.CommandEntry = CommandEntry;
|
|
||||||
exports.Command = Command;
|
exports.Command = Command;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
|
|
||||||
var util = require('../util');
|
var util = require('../util');
|
||||||
var intl = require('../intl');
|
var intl = require('../intl');
|
||||||
|
|
|
@ -1,17 +1,10 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
|
|
||||||
var util = require('../util');
|
|
||||||
var intl = require('../intl');
|
|
||||||
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
|
||||||
|
|
||||||
var Views = require('../views');
|
var Views = require('../views');
|
||||||
var ModalTerminal = Views.ModalTerminal;
|
var ModalTerminal = Views.ModalTerminal;
|
||||||
var ContainedBase = Views.ContainedBase;
|
var ContainedBase = Views.ContainedBase;
|
||||||
|
|
||||||
|
|
||||||
var TextGrabber = ContainedBase.extend({
|
var TextGrabber = ContainedBase.extend({
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
className: 'textGrabber box vertical',
|
className: 'textGrabber box vertical',
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
|
|
||||||
|
|
||||||
var Main = require('../app');
|
var Main = require('../app');
|
||||||
var Command = require('../models/commandModel').Command;
|
var Command = require('../models/commandModel').Command;
|
||||||
var CommandEntry = require('../models/commandModel').CommandEntry;
|
|
||||||
var CommandLineStore = require('../stores/CommandLineStore');
|
var CommandLineStore = require('../stores/CommandLineStore');
|
||||||
var CommandLineActions = require('../actions/CommandLineActions');
|
var CommandLineActions = require('../actions/CommandLineActions');
|
||||||
|
|
||||||
var Errors = require('../util/errors');
|
var Errors = require('../util/errors');
|
||||||
var Warning = Errors.Warning;
|
var Warning = Errors.Warning;
|
||||||
|
|
||||||
var util = require('../util');
|
|
||||||
var log = require('../log');
|
var log = require('../log');
|
||||||
var keyboard = require('../util/keyboard');
|
var keyboard = require('../util/keyboard');
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
|
|
||||||
var util = require('../util');
|
var util = require('../util');
|
||||||
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
|
|
||||||
var Main = require('../app');
|
var Main = require('../app');
|
||||||
var intl = require('../intl');
|
var intl = require('../intl');
|
||||||
var log = require('../log');
|
var log = require('../log');
|
||||||
var Constants = require('../util/constants');
|
var Constants = require('../util/constants');
|
||||||
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
||||||
var GitError = require('../util/errors').GitError;
|
|
||||||
|
|
||||||
var BaseView = Backbone.View.extend({
|
var BaseView = Backbone.View.extend({
|
||||||
getDestination: function() {
|
getDestination: function() {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
var LocaleStore = require('../stores/LocaleStore');
|
var LocaleStore = require('../stores/LocaleStore');
|
||||||
|
|
||||||
var util = require('../util');
|
var util = require('../util');
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
|
|
||||||
var ModalTerminal = require('../views').ModalTerminal;
|
|
||||||
var ContainedBase = require('../views').ContainedBase;
|
|
||||||
var ConfirmCancelView = require('../views').ConfirmCancelView;
|
|
||||||
var LeftRightView = require('../views').LeftRightView;
|
var LeftRightView = require('../views').LeftRightView;
|
||||||
var ModalAlert = require('../views').ModalAlert;
|
var ModalAlert = require('../views').ModalAlert;
|
||||||
var GitDemonstrationView = require('../views/gitDemonstrationView').GitDemonstrationView;
|
var GitDemonstrationView = require('../views/gitDemonstrationView').GitDemonstrationView;
|
||||||
|
@ -14,7 +10,6 @@ var BuilderViews = require('../views/builderViews');
|
||||||
var MarkdownPresenter = BuilderViews.MarkdownPresenter;
|
var MarkdownPresenter = BuilderViews.MarkdownPresenter;
|
||||||
|
|
||||||
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
var KeyboardListener = require('../util/keyboard').KeyboardListener;
|
||||||
var GitError = require('../util/errors').GitError;
|
|
||||||
|
|
||||||
var MultiView = Backbone.View.extend({
|
var MultiView = Backbone.View.extend({
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
var GitError = require('../util/errors').GitError;
|
var GitError = require('../util/errors').GitError;
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
var Q = require('q');
|
var Q = require('q');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
|
|
||||||
|
|
||||||
var ModalTerminal = require('../views').ModalTerminal;
|
var ModalTerminal = require('../views').ModalTerminal;
|
||||||
var ContainedBase = require('../views').ContainedBase;
|
var ContainedBase = require('../views').ContainedBase;
|
||||||
var ConfirmCancelView = require('../views').ConfirmCancelView;
|
var ConfirmCancelView = require('../views').ConfirmCancelView;
|
||||||
var LeftRightView = require('../views').LeftRightView;
|
|
||||||
|
|
||||||
var InteractiveRebaseView = ContainedBase.extend({
|
var InteractiveRebaseView = ContainedBase.extend({
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
var _ = require('underscore');
|
var _ = require('underscore');
|
||||||
// horrible hack to get localStorage Backbone plugin
|
var Backbone = require('backbone');
|
||||||
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
|
|
||||||
|
|
||||||
var Collections = require('../models/collections');
|
var Collections = require('../models/collections');
|
||||||
var CommitCollection = Collections.CommitCollection;
|
var CommitCollection = Collections.CommitCollection;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue