UI Cleanup - Updated AddSeries subtree.

src/UI/AddSeries/AddSeriesCollection.js

@@ -5,14 +5,18 @@ var _ = require('underscore');
 module.exports = Backbone.Collection.extend({
     url   : window.NzbDrone.ApiRoot + '/series/lookup',
     model : SeriesModel,
+
     parse : function(response) {
         var self = this;
+
         _.each(response, function(model) {
             model.id = undefined;
+
             if (self.unmappedFolderModel) {
                 model.path = self.unmappedFolderModel.get('folder').path;
             }
         });
+
         return response;
     }
 });

src/UI/AddSeries/AddSeriesLayout.js

@@ -10,30 +10,43 @@ require('../Series/SeriesCollection');
 
 module.exports = Marionette.Layout.extend({
     template : 'AddSeries/AddSeriesLayoutTemplate',
-    regions         : {workspace : '#add-series-workspace'},
+
+    regions : {
+        workspace : '#add-series-workspace'
+    },
+
     events : {
         'click .x-import'  : '_importSeries',
         'click .x-add-new' : '_addSeries'
     },
-    attributes      : {id : 'add-series-screen'},
+
+    attributes : {
+        id : 'add-series-screen'
+    },
+
     initialize : function() {
         ProfileCollection.fetch();
         RootFolderCollection.fetch().done(function() {
             RootFolderCollection.synced = true;
         });
     },
+
     onShow : function() {
         this.workspace.show(new AddSeriesView());
     },
+
     _folderSelected : function(options) {
         vent.trigger(vent.Commands.CloseModalCommand);
+
         this.workspace.show(new ExistingSeriesCollectionView({ model : options.model }));
     },
+
     _importSeries : function() {
         this.rootFolderLayout = new RootFolderLayout();
         this.listenTo(this.rootFolderLayout, 'folderSelected', this._folderSelected);
         AppLayout.modalRegion.show(this.rootFolderLayout);
     },
+
     _addSeries : function() {
         this.workspace.show(new AddSeriesView());
     }

src/UI/AddSeries/AddSeriesView.js

@@ -10,69 +10,119 @@ var LoadingView = require('../Shared/LoadingView');
 
 module.exports = Marionette.Layout.extend({
     template : 'AddSeries/AddSeriesViewTemplate',
-    regions              : {searchResult : '#search-result'},
+
+    regions : {
+        searchResult : '#search-result'
+    },
+
     ui : {
         seriesSearch : '.x-series-search',
         searchBar    : '.x-search-bar',
         loadMore     : '.x-load-more'
     },
-    events               : {"click .x-load-more" : '_onLoadMore'},
+
+    events : {
+        'click .x-load-more' : '_onLoadMore'
+    },
+
     initialize : function(options) {
         this.isExisting = options.isExisting;
         this.collection = new AddSeriesCollection();
+
         if (this.isExisting) {
             this.collection.unmappedFolderModel = this.model;
         }
+
         if (this.isExisting) {
             this.className = 'existing-series';
-        }
+        } else {
-        else {
             this.className = 'new-series';
         }
+
         this.listenTo(vent, vent.Events.SeriesAdded, this._onSeriesAdded);
         this.listenTo(this.collection, 'sync', this._showResults);
+
         this.resultCollectionView = new SearchResultCollectionView({
             collection : this.collection,
             isExisting : this.isExisting
         });
+
         this.throttledSearch = _.debounce(this.search, 1000, { trailing : true }).bind(this);
     },
+
     onRender : function() {
         var self = this;
+
         this.$el.addClass(this.className);
+
         this.ui.seriesSearch.keyup(function(e) {
-            if(_.contains([9, 16, 17, 18, 19, 20, 33, 34, 35, 36, 37, 38, 39, 40, 91, 92, 93], e.keyCode)) {
+
+            if (_.contains([
+                    9,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    38,
+                    39,
+                    40,
+                    91,
+                    92,
+                    93
+                ], e.keyCode)) {
                 return;
             }
+
             self._abortExistingSearch();
-            self.throttledSearch({term : self.ui.seriesSearch.val()});
+            self.throttledSearch({
+                term : self.ui.seriesSearch.val()
             });
+        });
+
         this._clearResults();
+
         if (this.isExisting) {
             this.ui.searchBar.hide();
         }
     },
+
     onShow : function() {
         this.ui.seriesSearch.focus();
     },
+
     search : function(options) {
         var self = this;
+
         this.collection.reset();
+
         if (!options.term || options.term === this.collection.term) {
             return Marionette.$.Deferred().resolve();
         }
+
         this.searchResult.show(new LoadingView());
         this.collection.term = options.term;
-        this.currentSearchPromise = this.collection.fetch({data : {term : options.term}});
+        this.currentSearchPromise = this.collection.fetch({
+            data : { term : options.term }
+        });
+
         this.currentSearchPromise.fail(function() {
             self._showError();
         });
+
         return this.currentSearchPromise;
     },
+
     _onSeriesAdded : function(options) {
         if (this.isExisting && options.series.get('path') === this.model.get('folder').path) {
             this.close();
         }
+
         else if (!this.isExisting) {
             this.collection.term = '';
             this.collection.reset();
@@ -81,28 +131,30 @@ module.exports = Marionette.Layout.extend({
             this.ui.seriesSearch.focus();
         }
     },
+
     _onLoadMore : function() {
         var showingAll = this.resultCollectionView.showMore();
         this.ui.searchBar.show();
+
         if (showingAll) {
             this.ui.loadMore.hide();
         }
     },
+
     _clearResults : function() {
         if (!this.isExisting) {
             this.searchResult.show(new EmptyView());
-        }
+        } else {
-        else {
             this.searchResult.close();
         }
     },
+
     _showResults : function() {
         if (!this.isClosed) {
             if (this.collection.length === 0) {
                 this.ui.searchBar.show();
                 this.searchResult.show(new NotFoundView({ term : this.collection.term }));
-            }
+            } else {
-            else {
                 this.searchResult.show(this.resultCollectionView);
                 if (!this.showingAll && this.isExisting) {
                     this.ui.loadMore.show();
@@ -110,15 +162,16 @@ module.exports = Marionette.Layout.extend({
             }
         }
     },
+
     _abortExistingSearch : function() {
         if (this.currentSearchPromise && this.currentSearchPromise.readyState > 0 && this.currentSearchPromise.readyState < 4) {
             console.log('aborting previous pending search request.');
             this.currentSearchPromise.abort();
-        }
+        } else {
-        else {
             this._clearResults();
         }
     },
+
     _showError : function() {
         if (!this.isClosed) {
             this.ui.searchBar.show();

src/UI/AddSeries/EmptyView.js

@@ -1,3 +1,5 @@
 var Marionette = require('marionette');
 
-module.exports = Marionette.CompositeView.extend({template : 'AddSeries/EmptyViewTemplate'});
+module.exports = Marionette.CompositeView.extend({
+    template : 'AddSeries/EmptyViewTemplate'
+});

src/UI/AddSeries/ErrorView.js

@@ -2,9 +2,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.CompositeView.extend({
     template : 'AddSeries/ErrorViewTemplate',
+
     initialize : function(options) {
         this.options = options;
     },
+
     templateHelpers : function() {
         return this.options;
     }

src/UI/AddSeries/Existing/AddExistingSeriesCollectionView.js

@@ -6,20 +6,28 @@ module.exports = Marionette.CompositeView.extend({
     itemView          : AddSeriesView,
     itemViewContainer : '.x-loading-folders',
     template          : 'AddSeries/Existing/AddExistingSeriesCollectionViewTemplate',
-    ui                : {loadingFolders : '.x-loading-folders'},
+
+    ui : {
+        loadingFolders : '.x-loading-folders'
+    },
+
     initialize : function() {
         this.collection = new UnmappedFolderCollection();
         this.collection.importItems(this.model);
     },
+
     showCollection : function() {
         this._showAndSearch(0);
     },
+
     appendHtml : function(collectionView, itemView, index) {
         collectionView.ui.loadingFolders.before(itemView.el);
     },
+
     _showAndSearch : function(index) {
         var self = this;
         var model = this.collection.at(index);
+
         if (model) {
             var currentIndex = index;
             var folderName = model.get('folder').name;
@@ -30,9 +38,14 @@ module.exports = Marionette.CompositeView.extend({
                 }
             });
         }
+
         else {
             this.ui.loadingFolders.hide();
         }
     },
-    itemViewOptions   : {isExisting : true}
+
+    itemViewOptions : {
+        isExisting : true
+    }
+
 });

src/UI/AddSeries/Existing/UnmappedFolderCollection.js

@@ -4,9 +4,12 @@ var _ = require('underscore');
 
 module.exports = Backbone.Collection.extend({
     model : UnmappedFolderModel,
+
     importItems : function(rootFolderModel) {
+
         this.reset();
         var rootFolder = rootFolderModel;
+
         _.each(rootFolderModel.get('unmappedFolders'), function(folder) {
             this.push(new UnmappedFolderModel({
                 rootFolder : rootFolder,

src/UI/AddSeries/MonitoringTooltipTemplate.hbs

@@ -1,4 +1,4 @@
-<dl class="monitor-tooltip-contents">
+<dl class="monitor-tooltip-contents">
     <dt>All</dt>
     <dd>Monitor all episodes except specials</dd>
     <dt>Future</dt>

src/UI/AddSeries/NotFoundView.js

@@ -2,9 +2,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.CompositeView.extend({
     template : 'AddSeries/NotFoundViewTemplate',
+
     initialize : function(options) {
         this.options = options;
     },
+
     templateHelpers : function() {
         return this.options;
     }

src/UI/AddSeries/RootFolders/RootFolderCollection.js

@@ -2,10 +2,9 @@ var Backbone = require('backbone');
 var RootFolderModel = require('./RootFolderModel');
 require('../../Mixins/backbone.signalr.mixin');
 
-module.exports = (function(){
 var RootFolderCollection = Backbone.Collection.extend({
     url   : window.NzbDrone.ApiRoot + '/rootfolder',
     model : RootFolderModel
 });
-    return new RootFolderCollection();
+
-}).call(this);
+module.exports = new RootFolderCollection();

src/UI/AddSeries/RootFolders/RootFolderItemView.js

@@ -3,19 +3,24 @@ var Marionette = require('marionette');
 module.exports = Marionette.ItemView.extend({
     template : 'AddSeries/RootFolders/RootFolderItemViewTemplate',
     tagName  : 'tr',
+
     initialize : function() {
         this.listenTo(this.model, 'change', this.render);
     },
+
     events : {
         'click .x-delete' : 'removeFolder',
         'click .x-folder' : 'folderSelected'
     },
+
     removeFolder : function() {
         var self = this;
+
         this.model.destroy().success(function() {
             self.close();
         });
     },
+
     folderSelected : function() {
         this.trigger('folderSelected', this.model);
     }

src/UI/AddSeries/RootFolders/RootFolderLayout.js

@@ -6,49 +6,72 @@ var LoadingView = require('../../Shared/LoadingView');
 var AsValidatedView = require('../../Mixins/AsValidatedView');
 require('../../Mixins/FileBrowser');
 
-module.exports = (function(){
+var Layout = Marionette.Layout.extend({
-    var layout = Marionette.Layout.extend({
     template : 'AddSeries/RootFolders/RootFolderLayoutTemplate',
-        ui                : {pathInput : '.x-path'},
+
-        regions           : {currentDirs : '#current-dirs'},
+    ui : {
+        pathInput : '.x-path'
+    },
+
+    regions : {
+        currentDirs : '#current-dirs'
+    },
+
     events : {
         'click .x-add'          : '_addFolder',
         'keydown .x-path input' : '_keydown'
     },
+
     initialize : function() {
         this.collection = RootFolderCollection;
         this.rootfolderListView = new RootFolderCollectionView({ collection : RootFolderCollection });
+
         this.listenTo(this.rootfolderListView, 'itemview:folderSelected', this._onFolderSelected);
         this.listenTo(RootFolderCollection, 'sync', this._showCurrentDirs);
     },
+
     onRender : function() {
         this.currentDirs.show(new LoadingView());
+
         if (RootFolderCollection.synced) {
             this._showCurrentDirs();
         }
+
         this.ui.pathInput.fileBrowser();
     },
+
     _onFolderSelected : function(options) {
         this.trigger('folderSelected', options);
     },
+
     _addFolder : function() {
         var self = this;
-            var newDir = new RootFolderModel({Path : this.ui.pathInput.val()});
+
+        var newDir = new RootFolderModel({
+            Path : this.ui.pathInput.val()
+        });
+
         this.bindToModelValidation(newDir);
+
         newDir.save().done(function() {
             RootFolderCollection.add(newDir);
             self.trigger('folderSelected', { model : newDir });
         });
     },
+
     _showCurrentDirs : function() {
         this.currentDirs.show(this.rootfolderListView);
     },
+
     _keydown : function(e) {
         if (e.keyCode !== 13) {
             return;
         }
+
         this._addFolder();
     }
 });
-    return AsValidatedView.apply(layout);
+
-}).call(this);
+var Layout = AsValidatedView.apply(Layout);
+
+module.exports = Layout;

src/UI/AddSeries/RootFolders/RootFolderModel.js

@@ -2,5 +2,7 @@ var Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
     urlRoot  : window.NzbDrone.ApiRoot + '/rootfolder',
-    defaults : {freeSpace : 0}
+    defaults : {
+        freeSpace : 0
+    }
 });

src/UI/AddSeries/SearchResultCollectionView.js

@@ -3,19 +3,24 @@ var SearchResultView = require('./SearchResultView');
 
 module.exports = Marionette.CollectionView.extend({
     itemView : SearchResultView,
+
     initialize : function(options) {
         this.isExisting = options.isExisting;
         this.showing = 1;
     },
+
     showAll : function() {
         this.showingAll = true;
         this.render();
     },
+
     showMore : function() {
         this.showing += 5;
         this.render();
+
         return this.showing >= this.collection.length;
     },
+
     appendHtml : function(collectionView, itemView, index) {
         if (!this.isExisting || index < this.showing || index === 0) {
             collectionView.$el.append(itemView.el);

src/UI/AddSeries/SearchResultView.js

@@ -142,8 +142,7 @@ var view = Marionette.ItemView.extend({
             var rootFolderLayout = new RootFolderLayout();
             this.listenToOnce(rootFolderLayout, 'folderSelected', this._setRootFolder);
             AppLayout.modalRegion.show(rootFolderLayout);
-        }
+        } else {
-        else {
             Config.setValue(Config.Keys.DefaultRootFolderId, rootFolderValue);
         }
     },