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

removed all horrible hack references

Browse source
This commit is contained in:
Peter Cottle 2015-04-04 11:24:49 -07:00
parent 3a710c8ab4
commit b3cf8263a2
12 changed files with 11 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/git/index.js
View file

@ -1,6 +1,5 @@
var _ = require('underscore');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var Backbone = require('backbone');
var Q = require('q');
var intl = require('../intl');
@ -15,7 +14,6 @@ var Main = require('../app');
var Commands = require('../commands');
var GitError = Errors.GitError;
var CommandResult = Errors.CommandResult;
var EventBaton = require('../util/eventBaton').EventBaton;
var ORIGIN_PREFIX = 'o/';
var TAB = '   ';

10
src/js/models/collections.js
View file

@ -1,14 +1,12 @@
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var Backbone = require('backbone');
var Commit = require('../git').Commit;
var Branch = require('../git').Branch;
var Tag = require('../git').Tag;
var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry;
var TIME = require('../util/constants').TIME;
var CommitCollection = Backbone.Collection.extend({
@ -27,11 +25,6 @@ var TagCollection = Backbone.Collection.extend({
model: Tag
});
var CommandEntryCollection = Backbone.Collection.extend({
model: CommandEntry,
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
});
var CommandBuffer = Backbone.Model.extend({
defaults: {
collection: null
@ -131,6 +124,5 @@ exports.CommitCollection = CommitCollection;
exports.CommandCollection = CommandCollection;
exports.BranchCollection = BranchCollection;
exports.TagCollection = TagCollection;
exports.CommandEntryCollection = CommandEntryCollection;
exports.CommandBuffer = CommandBuffer;

11
src/js/models/commandModel.js
View file

@ -1,6 +1,5 @@
var _ = require('underscore');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var Backbone = require('backbone');
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;

3
src/js/sandbox/index.js
View file

@ -1,7 +1,6 @@
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
var Backbone = require('backbone');
var util = require('../util');
var intl = require('../intl');

7
src/js/views/builderViews.js
View file

@ -1,17 +1,10 @@
var _ = require('underscore');
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 ModalTerminal = Views.ModalTerminal;
var ContainedBase = Views.ContainedBase;
var TextGrabber = ContainedBase.extend({
tagName: 'div',
className: 'textGrabber box vertical',

5
src/js/views/commandViews.js
View file

@ -1,17 +1,14 @@
var _ = require('underscore');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var Backbone = require('backbone');
var Main = require('../app');
var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry;
var CommandLineStore = require('../stores/CommandLineStore');
var CommandLineActions = require('../actions/CommandLineActions');
var Errors = require('../util/errors');
var Warning = Errors.Warning;
var util = require('../util');
var log = require('../log');
var keyboard = require('../util/keyboard');

3
src/js/views/gitDemonstrationView.js
View file

@ -1,7 +1,6 @@
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
var Backbone = require('backbone');
var util = require('../util');
var KeyboardListener = require('../util/keyboard').KeyboardListener;

4
src/js/views/index.js
View file

@ -1,14 +1,12 @@
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
var Backbone = require('backbone');
var Main = require('../app');
var intl = require('../intl');
var log = require('../log');
var Constants = require('../util/constants');
var KeyboardListener = require('../util/keyboard').KeyboardListener;
var GitError = require('../util/errors').GitError;
var BaseView = Backbone.View.extend({
getDestination: function() {

3
src/js/views/levelDropdownView.js
View file

@ -1,7 +1,6 @@
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
var Backbone = require('backbone');
var LocaleStore = require('../stores/LocaleStore');
var util = require('../util');

7
src/js/views/multiView.js
View file

@ -1,11 +1,7 @@
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
var Backbone = require('backbone');
var ModalTerminal = require('../views').ModalTerminal;
var ContainedBase = require('../views').ContainedBase;
var ConfirmCancelView = require('../views').ConfirmCancelView;
var LeftRightView = require('../views').LeftRightView;
var ModalAlert = require('../views').ModalAlert;
var GitDemonstrationView = require('../views/gitDemonstrationView').GitDemonstrationView;
@ -14,7 +10,6 @@ var BuilderViews = require('../views/builderViews');
var MarkdownPresenter = BuilderViews.MarkdownPresenter;
var KeyboardListener = require('../util/keyboard').KeyboardListener;
var GitError = require('../util/errors').GitError;
var MultiView = Backbone.View.extend({
tagName: 'div',

4
src/js/views/rebaseView.js
View file

@ -1,13 +1,11 @@
var GitError = require('../util/errors').GitError;
var _ = require('underscore');
var Q = require('q');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
var Backbone = require('backbone');
var ModalTerminal = require('../views').ModalTerminal;
var ContainedBase = require('../views').ContainedBase;
var ConfirmCancelView = require('../views').ConfirmCancelView;
var LeftRightView = require('../views').LeftRightView;
var InteractiveRebaseView = ContainedBase.extend({
tagName: 'div',

3
src/js/visuals/visualization.js
View file

@ -1,6 +1,5 @@
var _ = require('underscore');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var Backbone = require('backbone');
var Collections = require('../models/collections');
var CommitCollection = Collections.CommitCollection;