diff --git a/src/js/git/index.js b/src/js/git/index.js index 00c7d53c..3200d42e 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -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 = '   '; diff --git a/src/js/models/collections.js b/src/js/models/collections.js index 6007db5e..9cb5f7bf 100644 --- a/src/js/models/collections.js +++ b/src/js/models/collections.js @@ -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; diff --git a/src/js/models/commandModel.js b/src/js/models/commandModel.js index 42ead747..a4cec7b0 100644 --- a/src/js/models/commandModel.js +++ b/src/js/models/commandModel.js @@ -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; diff --git a/src/js/sandbox/index.js b/src/js/sandbox/index.js index 3b798ae3..65499259 100644 --- a/src/js/sandbox/index.js +++ b/src/js/sandbox/index.js @@ -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'); diff --git a/src/js/views/builderViews.js b/src/js/views/builderViews.js index 995b26fe..63f2c25f 100644 --- a/src/js/views/builderViews.js +++ b/src/js/views/builderViews.js @@ -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', diff --git a/src/js/views/commandViews.js b/src/js/views/commandViews.js index af33a45a..7abf9b15 100644 --- a/src/js/views/commandViews.js +++ b/src/js/views/commandViews.js @@ -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'); diff --git a/src/js/views/gitDemonstrationView.js b/src/js/views/gitDemonstrationView.js index 28d295b9..f4b9034d 100644 --- a/src/js/views/gitDemonstrationView.js +++ b/src/js/views/gitDemonstrationView.js @@ -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; diff --git a/src/js/views/index.js b/src/js/views/index.js index 408f1702..a738697c 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -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() { diff --git a/src/js/views/levelDropdownView.js b/src/js/views/levelDropdownView.js index e852cfb4..06171df9 100644 --- a/src/js/views/levelDropdownView.js +++ b/src/js/views/levelDropdownView.js @@ -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'); diff --git a/src/js/views/multiView.js b/src/js/views/multiView.js index 8335e714..4d4bd6a5 100644 --- a/src/js/views/multiView.js +++ b/src/js/views/multiView.js @@ -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', diff --git a/src/js/views/rebaseView.js b/src/js/views/rebaseView.js index 69cb1b46..eaf88689 100644 --- a/src/js/views/rebaseView.js +++ b/src/js/views/rebaseView.js @@ -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', diff --git a/src/js/visuals/visualization.js b/src/js/visuals/visualization.js index fd72e96b..ee76cbf6 100644 --- a/src/js/visuals/visualization.js +++ b/src/js/visuals/visualization.js @@ -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;