UI Cleanup - Updated Settings subtree.

src/UI/Settings/DownloadClient/Add/DownloadClientAddItemView.js

@@ -8,39 +8,51 @@ module.exports = Marionette.ItemView.extend({
     template  : 'Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate',
     tagName   : 'li',
     className : 'add-thingy-item',
+
     events : {
-        "click .x-preset" : '_addPreset',
-        "click"           : '_add'
+        'click .x-preset' : '_addPreset',
+        'click'           : '_add'
     },
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     _addPreset : function(e) {
         var presetName = $(e.target).closest('.x-preset').attr('data-id');
+
         var presetData = _.where(this.model.get('presets'), { name : presetName })[0];
+
         this.model.set(presetData);
+
         this.model.set({
             id     : undefined,
             enable : true
         });
+
         var editView = new EditView({
             model            : this.model,
             targetCollection : this.targetCollection
         });
+
         AppLayout.modalRegion.show(editView);
     },
+
     _add : function(e) {
         if ($(e.target).closest('.btn,.btn-group').length !== 0) {
             return;
         }
+
         this.model.set({
             id     : undefined,
             enable : true
         });
+
         var editView = new EditView({
             model            : this.model,
             targetCollection : this.targetCollection
         });
+
         AppLayout.modalRegion.show(editView);
     }
 });

src/UI/Settings/DownloadClient/Add/DownloadClientSchemaModal.js

@@ -11,23 +11,29 @@ module.exports = {
         schemaCollection.url = schemaCollection.url + '/schema';
         schemaCollection.fetch();
         schemaCollection.url = originalUrl;
+
         var groupedSchemaCollection = new Backbone.Collection();
+
         schemaCollection.on('sync', function() {
+
             var groups = schemaCollection.groupBy(function(model, iterator) {
                 return model.get('protocol');
             });
             var modelCollection = _.map(groups, function(values, key, list) {
                 return {
-                    "header"   : key,
+                    'header'   : key,
                     collection : values
                 };
             });
+
             groupedSchemaCollection.reset(modelCollection);
         });
+
         var view = new AddCollectionView({
             collection       : groupedSchemaCollection,
             targetCollection : collection
         });
+
         AppLayout.modalRegion.show(view);
     }
 };

src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteView.js

@@ -3,7 +3,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate',
-    events   : {'click .x-confirm-delete' : '_delete'},
+
+    events : {
+        'click .x-confirm-delete' : '_delete'
+    },
+
     _delete : function() {
         this.model.destroy({
             wait    : true,

src/UI/Settings/DownloadClient/DownloadClientCollection.js

@@ -4,17 +4,22 @@ var DownloadClientModel = require('./DownloadClientModel');
 module.exports = Backbone.Collection.extend({
     model : DownloadClientModel,
     url   : window.NzbDrone.ApiRoot + '/downloadclient',
+
     comparator : function(left, right, collection) {
         var result = 0;
+
         if (left.get('protocol')) {
             result = -left.get('protocol').localeCompare(right.get('protocol'));
         }
+
         if (result === 0 && left.get('name')) {
             result = left.get('name').localeCompare(right.get('name'));
         }
+
         if (result === 0) {
             result = left.get('implementation').localeCompare(right.get('implementation'));
         }
+
         return result;
     }
 });

src/UI/Settings/DownloadClient/DownloadClientCollectionView.js

@@ -6,11 +6,19 @@ module.exports = Marionette.CompositeView.extend({
     itemView          : ItemView,
     itemViewContainer : '.download-client-list',
     template          : 'Settings/DownloadClient/DownloadClientCollectionViewTemplate',
-    ui                : {"addCard" : '.x-add-card'},
-    events            : {"click .x-add-card" : '_openSchemaModal'},
+
+    ui : {
+        'addCard' : '.x-add-card'
+    },
+
+    events : {
+        'click .x-add-card' : '_openSchemaModal'
+    },
+
     appendHtml : function(collectionView, itemView, index) {
         collectionView.ui.addCard.parent('li').before(itemView.el);
     },
+
     _openSchemaModal : function() {
         SchemaModal.open(this.collection);
     }

src/UI/Settings/DownloadClient/DownloadClientItemView.js

@@ -5,10 +5,15 @@ var EditView = require('./Edit/DownloadClientEditView');
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/DownloadClientItemViewTemplate',
     tagName  : 'li',
-    events     : {"click" : '_edit'},
+
+    events : {
+        'click' : '_edit'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _edit : function() {
         var view = new EditView({
             model            : this.model,

src/UI/Settings/DownloadClient/DownloadClientLayout.js

@@ -8,18 +8,21 @@ var RemotePathMappingCollectionView = require('./RemotePathMapping/RemotePathMap
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/DownloadClient/DownloadClientLayoutTemplate',
+
     regions : {
         downloadClients    : '#x-download-clients-region',
         downloadHandling   : '#x-download-handling-region',
         droneFactory       : '#x-dronefactory-region',
         remotePathMappings : '#x-remotepath-mapping-region'
     },
+
     initialize : function() {
         this.downloadClientsCollection = new DownloadClientCollection();
         this.downloadClientsCollection.fetch();
         this.remotePathMappingCollection = new RemotePathMappingCollection();
         this.remotePathMappingCollection.fetch();
     },
+
     onShow : function() {
         this.downloadClients.show(new DownloadClientCollectionView({ collection : this.downloadClientsCollection }));
         this.downloadHandling.show(new DownloadHandlingView({ model : this.model }));

src/UI/Settings/DownloadClient/DownloadHandling/DownloadHandlingView.js

@@ -2,19 +2,21 @@ var Marionette = require('marionette');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../../Mixins/AsValidatedView');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/DownloadHandling/DownloadHandlingViewTemplate',
+
     ui : {
         completedDownloadHandlingCheckbox : '.x-completed-download-handling',
         completedDownloadOptions          : '.x-completed-download-options',
         failedAutoRedownladCheckbox       : '.x-failed-auto-redownload',
         failedDownloadOptions             : '.x-failed-download-options'
     },
+
     events : {
-            "change .x-completed-download-handling" : '_setCompletedDownloadOptionsVisibility',
-            "change .x-failed-auto-redownload"      : '_setFailedDownloadOptionsVisibility'
+        'change .x-completed-download-handling' : '_setCompletedDownloadOptionsVisibility',
+        'change .x-failed-auto-redownload'      : '_setFailedDownloadOptionsVisibility'
     },
+
     onRender : function() {
         if (!this.ui.completedDownloadHandlingCheckbox.prop('checked')) {
             this.ui.completedDownloadOptions.hide();
@@ -23,26 +25,26 @@ module.exports = (function(){
             this.ui.failedDownloadOptions.hide();
         }
     },
+
     _setCompletedDownloadOptionsVisibility : function() {
         var checked = this.ui.completedDownloadHandlingCheckbox.prop('checked');
         if (checked) {
             this.ui.completedDownloadOptions.slideDown();
-            }
-            else {
+        } else {
             this.ui.completedDownloadOptions.slideUp();
         }
     },
+
     _setFailedDownloadOptionsVisibility : function() {
         var checked = this.ui.failedAutoRedownladCheckbox.prop('checked');
         if (checked) {
             this.ui.failedDownloadOptions.slideDown();
-            }
-            else {
+        } else {
             this.ui.failedDownloadOptions.slideUp();
         }
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+module.exports = view;

src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryView.js

@@ -3,15 +3,19 @@ var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../../Mixins/AsValidatedView');
 require('../../../Mixins/FileBrowser');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate',
-        ui       : {droneFactory : '.x-path'},
+
+    ui : {
+        droneFactory : '.x-path'
+    },
+
     onShow : function() {
         this.ui.droneFactory.fileBrowser();
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js

@@ -1,4 +1,4 @@
-var vent = require('vent');
+var vent = require('vent');
 var Marionette = require('marionette');
 var DeleteView = require('../Delete/DownloadClientDeleteView');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
@@ -8,40 +8,49 @@ require('../../../Form/FormBuilder');
 require('../../../Mixins/FileBrowser');
 require('bootstrap');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/Edit/DownloadClientEditViewTemplate',
+
     ui : {
         path      : '.x-path',
         modalBody : '.modal-body'
     },
+
     events : {
         'click .x-back' : '_back'
     },
+
     _deleteView : DeleteView,
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     onShow : function() {
         if (this.ui.path.length > 0) {
             this.ui.modalBody.addClass('modal-overflow');
         }
+
         this.ui.path.fileBrowser();
     },
+
     _onAfterSave : function() {
         this.targetCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     },
+
     _onAfterSaveAndAdd : function() {
         this.targetCollection.add(this.model, { merge : true });
+
         require('../Add/DownloadClientSchemaModal').open(this.targetCollection);
     },
     _back              : function() {
         require('../Add/DownloadClientSchemaModal').open(this.targetCollection);
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingCollectionView.js

@@ -9,14 +9,20 @@ module.exports = Marionette.CompositeView.extend({
     template          : 'Settings/DownloadClient/RemotePathMapping/RemotePathMappingCollectionViewTemplate',
     itemViewContainer : '.x-rows',
     itemView          : RemotePathMappingItemView,
-    events            : {"click .x-add" : '_addMapping'},
+
+    events : {
+        'click .x-add' : '_addMapping'
+    },
+
     _addMapping : function() {
         var model = new RemotePathMappingModel();
         model.collection = this.collection;
+
         var view = new EditView({
             model            : model,
             targetCollection : this.collection
         });
+
         AppLayout.modalRegion.show(view);
     }
 });

src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteView.js

@@ -3,7 +3,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate',
-    events   : {"click .x-confirm-delete" : '_delete'},
+
+    events : {
+        'click .x-confirm-delete' : '_delete'
+    },
+
     _delete : function() {
         this.model.destroy({
             wait    : true,

src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditView.js

@@ -10,30 +10,36 @@ var AsEditModalView = require('../../../Mixins/AsEditModalView');
 require('../../../Mixins/FileBrowser');
 require('bootstrap');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate',
+
     ui : {
         path      : '.x-path',
         modalBody : '.modal-body'
     },
+
     _deleteView : DeleteView,
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     onShow : function() {
         if (this.ui.path.length > 0) {
             this.ui.modalBody.addClass('modal-overflow');
         }
+
         this.ui.path.fileBrowser();
     },
+
     _onAfterSave : function() {
         this.targetCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingItemView.js

@@ -5,15 +5,21 @@ var EditView = require('./RemotePathMappingEditView');
 module.exports = Marionette.ItemView.extend({
     template  : 'Settings/DownloadClient/RemotePathMapping/RemotePathMappingItemViewTemplate',
     className : 'row',
-    events       : {"click .x-edit" : '_editMapping'},
+
+    events : {
+        'click .x-edit' : '_editMapping'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _editMapping : function() {
         var view = new EditView({
             model            : this.model,
             targetCollection : this.model.collection
         });
+
         AppLayout.modalRegion.show(view);
     }
 });

src/UI/Settings/General/GeneralView.js

@@ -1,4 +1,3 @@
-
 var vent = require('../../vent');
 var Marionette = require('marionette');
 var CommandController = require('../../Commands/CommandController');

src/UI/Settings/Indexers/Add/IndexerAddItemView.js

@@ -1,4 +1,4 @@
-var _ = require('underscore');
+var _ = require('underscore');
 var $ = require('jquery');
 var AppLayout = require('../../../AppLayout');
 var Marionette = require('marionette');
@@ -13,21 +13,28 @@ module.exports = Marionette.ItemView.extend({
         'click .x-preset' : '_addPreset',
         'click'           : '_add'
     },
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     _addPreset : function(e) {
         var presetName = $(e.target).closest('.x-preset').attr('data-id');
         var presetData = _.where(this.model.get('presets'), { name : presetName })[0];
+
         this.model.set(presetData);
+
         this._openEdit();
     },
+
     _add : function(e) {
         if ($(e.target).closest('.btn,.btn-group').length !== 0) {
             return;
         }
+
         this._openEdit();
     },
+
     _openEdit : function() {
         this.model.set({
             id           : undefined,
@@ -39,6 +46,7 @@ module.exports = Marionette.ItemView.extend({
             model            : this.model,
             targetCollection : this.targetCollection
         });
+
         AppLayout.modalRegion.show(editView);
     }
 });

src/UI/Settings/Indexers/Add/IndexerSchemaModal.js

@@ -11,8 +11,11 @@ module.exports = {
         schemaCollection.url = schemaCollection.url + '/schema';
         schemaCollection.fetch();
         schemaCollection.url = originalUrl;
+
         var groupedSchemaCollection = new Backbone.Collection();
+
         schemaCollection.on('sync', function() {
+
             var groups = schemaCollection.groupBy(function(model, iterator) {
                 return model.get('protocol');
             });
@@ -22,12 +25,15 @@ module.exports = {
                     collection : values
                 };
             });
+
             groupedSchemaCollection.reset(modelCollection);
         });
+
         var view = new AddCollectionView({
             collection       : groupedSchemaCollection,
             targetCollection : collection
         });
+
         AppLayout.modalRegion.show(view);
     }
 };

src/UI/Settings/Indexers/Delete/IndexerDeleteView.js

@@ -3,7 +3,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Indexers/Delete/IndexerDeleteViewTemplate',
-    events   : {"click .x-confirm-delete" : '_delete'},
+
+    events : {
+        'click .x-confirm-delete' : '_delete'
+    },
+
     _delete : function() {
         this.model.destroy({
             wait    : true,

src/UI/Settings/Indexers/Edit/IndexerEditView.js

@@ -1,4 +1,4 @@
-var vent = require('vent');
+var vent = require('vent');
 var Marionette = require('marionette');
 var DeleteView = require('../Delete/IndexerDeleteView');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
@@ -8,33 +8,41 @@ require('../../../Form/FormBuilder');
 require('../../../Mixins/AutoComplete');
 require('bootstrap');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Indexers/Edit/IndexerEditViewTemplate',
+
     events : {
         'click .x-back' : '_back'
     },
+
     _deleteView : DeleteView,
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     _onAfterSave : function() {
         this.targetCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     },
+
     _onAfterSaveAndAdd : function() {
         this.targetCollection.add(this.model, { merge : true });
+
         require('../Add/IndexerSchemaModal').open(this.targetCollection);
     },
+
     _back : function() {
         if (this.model.isNew()) {
             this.model.destroy();
         }
+
         require('../Add/IndexerSchemaModal').open(this.targetCollection);
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/Indexers/IndexerCollection.js

@@ -4,17 +4,22 @@ var IndexerModel = require('./IndexerModel');
 module.exports = Backbone.Collection.extend({
     model : IndexerModel,
     url   : window.NzbDrone.ApiRoot + '/indexer',
+
     comparator : function(left, right, collection) {
         var result = 0;
+
         if (left.get('protocol')) {
             result = -left.get('protocol').localeCompare(right.get('protocol'));
         }
+
         if (result === 0 && left.get('name')) {
             result = left.get('name').localeCompare(right.get('name'));
         }
+
         if (result === 0) {
             result = left.get('implementation').localeCompare(right.get('implementation'));
         }
+
         return result;
     }
 });

src/UI/Settings/Indexers/IndexerCollectionView.js

@@ -6,11 +6,19 @@ module.exports = Marionette.CompositeView.extend({
     itemView          : ItemView,
     itemViewContainer : '.indexer-list',
     template          : 'Settings/Indexers/IndexerCollectionViewTemplate',
-    ui                : {"addCard" : '.x-add-card'},
-    events            : {"click .x-add-card" : '_openSchemaModal'},
+
+    ui : {
+        'addCard' : '.x-add-card'
+    },
+
+    events : {
+        'click .x-add-card' : '_openSchemaModal'
+    },
+
     appendHtml : function(collectionView, itemView, index) {
         collectionView.ui.addCard.parent('li').before(itemView.el);
     },
+
     _openSchemaModal : function() {
         SchemaModal.open(this.collection);
     }

src/UI/Settings/Indexers/IndexerItemView.js

@@ -5,10 +5,15 @@ var EditView = require('./Edit/IndexerEditView');
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Indexers/IndexerItemViewTemplate',
     tagName  : 'li',
-    events     : {"click" : '_edit'},
+
+    events : {
+        'click' : '_edit'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _edit : function() {
         var view = new EditView({
             model            : this.model,

src/UI/Settings/Indexers/IndexerLayout.js

@@ -7,17 +7,21 @@ var RestrictionCollectionView = require('./Restriction/RestrictionCollectionView
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/Indexers/IndexerLayoutTemplate',
+
     regions : {
         indexers       : '#x-indexers-region',
         indexerOptions : '#x-indexer-options-region',
         restriction    : '#x-restriction-region'
     },
+
     initialize : function() {
         this.indexersCollection = new IndexerCollection();
         this.indexersCollection.fetch();
+
         this.restrictionCollection = new RestrictionCollection();
         this.restrictionCollection.fetch();
     },
+
     onShow : function() {
         this.indexers.show(new CollectionView({ collection : this.indexersCollection }));
         this.indexerOptions.show(new OptionsView({ model : this.model }));

src/UI/Settings/Indexers/Options/IndexerOptionsView.js

@@ -2,9 +2,11 @@ var Marionette = require('marionette');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../../Mixins/AsValidatedView');
 
-module.exports = (function(){
-    var view = Marionette.ItemView.extend({template : 'Settings/Indexers/Options/IndexerOptionsViewTemplate'});
+var view = Marionette.ItemView.extend({
+    template : 'Settings/Indexers/Options/IndexerOptionsViewTemplate'
+});
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/Indexers/Restriction/RestrictionCollectionView.js

@@ -9,13 +9,18 @@ module.exports = Marionette.CompositeView.extend({
     template          : 'Settings/Indexers/Restriction/RestrictionCollectionViewTemplate',
     itemViewContainer : '.x-rows',
     itemView          : RestrictionItemView,
-    events            : {"click .x-add" : '_addMapping'},
+
+    events : {
+        'click .x-add' : '_addMapping'
+    },
+
     _addMapping : function() {
         var model = this.collection.create({ tags : [] });
         var view = new EditView({
             model            : model,
             targetCollection : this.collection
         });
+
         AppLayout.modalRegion.show(view);
     }
 });

src/UI/Settings/Indexers/Restriction/RestrictionDeleteView.js

@@ -3,7 +3,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Indexers/Restriction/RestrictionDeleteViewTemplate',
-    events   : {'click .x-confirm-delete' : '_delete'},
+
+    events : {
+        'click .x-confirm-delete' : '_delete'
+    },
+
     _delete : function() {
         this.model.destroy({
             wait    : true,

src/UI/Settings/Indexers/Restriction/RestrictionEditView.js

@@ -11,39 +11,45 @@ require('../../../Mixins/TagInput');
 require('bootstrap');
 require('bootstrap.tagsinput');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Indexers/Restriction/RestrictionEditViewTemplate',
+
     ui : {
         required : '.x-required',
         ignored  : '.x-ignored',
         tags     : '.x-tags'
     },
+
     _deleteView : DeleteView,
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     onRender : function() {
         this.ui.required.tagsinput({
             trimValue : true,
             tagClass  : 'label label-success'
         });
+
         this.ui.ignored.tagsinput({
             trimValue : true,
             tagClass  : 'label label-danger'
         });
+
         this.ui.tags.tagInput({
             model    : this.model,
             property : 'tags'
         });
     },
+
     _onAfterSave : function() {
         this.targetCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+module.exports = view;

src/UI/Settings/Indexers/Restriction/RestrictionItemView.js

@@ -5,11 +5,19 @@ var EditView = require('./RestrictionEditView');
 module.exports = Marionette.ItemView.extend({
     template  : 'Settings/Indexers/Restriction/RestrictionItemViewTemplate',
     className : 'row',
-    ui         : {tags : '.x-tags'},
-    events     : {"click .x-edit" : '_edit'},
+
+    ui : {
+        tags : '.x-tags'
+    },
+
+    events : {
+        'click .x-edit' : '_edit'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _edit : function() {
         var view = new EditView({
             model            : this.model,

src/UI/Settings/MediaManagement/FileManagement/FileManagementView.js

@@ -5,15 +5,19 @@ var AsValidatedView = require('../../../Mixins/AsValidatedView');
 require('../../../Mixins/DirectoryAutoComplete');
 require('../../../Mixins/FileBrowser');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/MediaManagement/FileManagement/FileManagementViewTemplate',
-        ui       : {recyclingBin : '.x-path'},
+
+    ui : {
+        recyclingBin : '.x-path'
+    },
+
     onShow : function() {
         this.ui.recyclingBin.fileBrowser();
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/MediaManagement/MediaManagementLayout.js

@@ -6,16 +6,19 @@ var PermissionsView = require('./Permissions/PermissionsView');
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/MediaManagement/MediaManagementLayoutTemplate',
+
     regions : {
         episodeNaming  : '#episode-naming',
         sorting        : '#sorting',
         fileManagement : '#file-management',
         permissions    : '#permissions'
     },
+
     initialize : function(options) {
         this.settings = options.settings;
         this.namingSettings = options.namingSettings;
     },
+
     onShow : function() {
         this.episodeNaming.show(new NamingView({ model : this.namingSettings }));
         this.sorting.show(new SortingView({ model : this.settings }));

src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js

@@ -5,42 +5,48 @@ var NamingSampleModel = require('../NamingSampleModel');
 var BasicNamingModel = require('./BasicNamingModel');
 var AsModelBoundView = require('../../../../Mixins/AsModelBoundView');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate',
+
     ui : {
         namingOptions        : '.x-naming-options',
         singleEpisodeExample : '.x-single-episode-example',
         multiEpisodeExample  : '.x-multi-episode-example',
         dailyEpisodeExample  : '.x-daily-episode-example'
     },
+
     initialize : function(options) {
         this.namingModel = options.model;
         this.model = new BasicNamingModel();
+
         this._parseNamingModel();
+
         this.listenTo(this.model, 'change', this._buildFormat);
         this.listenTo(this.namingModel, 'sync', this._parseNamingModel);
     },
+
     _parseNamingModel : function() {
         var standardFormat = this.namingModel.get('standardEpisodeFormat');
+
         var includeSeriesTitle = standardFormat.match(/\{Series[-_. ]Title\}/i);
         var includeEpisodeTitle = standardFormat.match(/\{Episode[-_. ]Title\}/i);
         var includeQuality = standardFormat.match(/\{Quality[-_. ]Title\}/i);
         var numberStyle = standardFormat.match(/s?\{season(?:\:0+)?\}[ex]\{episode(?:\:0+)?\}/i);
         var replaceSpaces = standardFormat.indexOf(' ') === -1;
         var separator = standardFormat.match(/\}( - |\.-\.|\.| )|( - |\.-\.|\.| )\{/i);
+
         if (separator === null || separator[1] === '.-.') {
             separator = ' - ';
-            }
-            else {
+        } else {
             separator = separator[1];
         }
+
         if (numberStyle === null) {
             numberStyle = 'S{season:00}E{episode:00}';
-            }
-            else {
+        } else {
             numberStyle = numberStyle[0];
         }
+
         this.model.set({
             includeSeriesTitle  : includeSeriesTitle !== null,
             includeEpisodeTitle : includeEpisodeTitle !== null,
@@ -50,56 +56,63 @@ module.exports = (function(){
             separator           : separator
         }, { silent : true });
     },
+
     _buildFormat : function() {
         if (Config.getValueBoolean(Config.Keys.AdvancedSettings)) {
             return;
         }
+
         var standardEpisodeFormat = '';
         var dailyEpisodeFormat = '';
+
         if (this.model.get('includeSeriesTitle')) {
             if (this.model.get('replaceSpaces')) {
                 standardEpisodeFormat += '{Series.Title}';
                 dailyEpisodeFormat += '{Series.Title}';
-                }
-                else {
+            } else {
                 standardEpisodeFormat += '{Series Title}';
                 dailyEpisodeFormat += '{Series Title}';
             }
+
             standardEpisodeFormat += this.model.get('separator');
             dailyEpisodeFormat += this.model.get('separator');
         }
+
         standardEpisodeFormat += this.model.get('numberStyle');
         dailyEpisodeFormat += '{Air-Date}';
+
         if (this.model.get('includeEpisodeTitle')) {
             standardEpisodeFormat += this.model.get('separator');
             dailyEpisodeFormat += this.model.get('separator');
+
             if (this.model.get('replaceSpaces')) {
                 standardEpisodeFormat += '{Episode.Title}';
                 dailyEpisodeFormat += '{Episode.Title}';
-                }
-                else {
+            } else {
                 standardEpisodeFormat += '{Episode Title}';
                 dailyEpisodeFormat += '{Episode Title}';
             }
         }
+
         if (this.model.get('includeQuality')) {
             if (this.model.get('replaceSpaces')) {
                 standardEpisodeFormat += ' {Quality.Title}';
                 dailyEpisodeFormat += ' {Quality.Title}';
-                }
-                else {
+            } else {
                 standardEpisodeFormat += ' {Quality Title}';
                 dailyEpisodeFormat += ' {Quality Title}';
             }
         }
+
         if (this.model.get('replaceSpaces')) {
             standardEpisodeFormat = standardEpisodeFormat.replace(/\s/g, '.');
             dailyEpisodeFormat = dailyEpisodeFormat.replace(/\s/g, '.');
         }
+
         this.namingModel.set('standardEpisodeFormat', standardEpisodeFormat);
         this.namingModel.set('dailyEpisodeFormat', dailyEpisodeFormat);
         this.namingModel.set('animeEpisodeFormat', standardEpisodeFormat);
     }
 });
-    return AsModelBoundView.call(view);
-}).call(this);
+
+module.exports = AsModelBoundView.call(view);

src/UI/Settings/MediaManagement/Naming/NamingView.js

@@ -43,8 +43,7 @@ module.exports = (function(){
             var checked = this.ui.renameEpisodesCheckbox.prop('checked');
             if (checked) {
                 this.ui.namingOptions.slideDown();
-            }
-            else {
+            } else {
                 this.ui.namingOptions.slideUp();
             }
         },
@@ -68,8 +67,7 @@ module.exports = (function(){
             var input = this.$(target).closest('.x-helper-input').children('input');
             if (this.$(target).attr('data-token')) {
                 token = '{{0}}'.format(this.$(target).attr('data-token'));
-            }
-            else {
+            } else {
                 token = this.$(target).attr('data-separator');
             }
             input.val(input.val() + token);

src/UI/Settings/MediaManagement/Permissions/PermissionsView.js

@@ -2,9 +2,10 @@ var Marionette = require('marionette');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../../Mixins/AsValidatedView');
 
-module.exports = (function(){
-    var view = Marionette.ItemView.extend({template : 'Settings/MediaManagement/Permissions/PermissionsViewTemplate'});
+var view = Marionette.ItemView.extend({
+    template : 'Settings/MediaManagement/Permissions/PermissionsViewTemplate'
+});
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/MediaManagement/Sorting/SortingView.js

@@ -2,9 +2,11 @@ var Marionette = require('marionette');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../../Mixins/AsValidatedView');
 
-module.exports = (function(){
-    var view = Marionette.ItemView.extend({template : 'Settings/MediaManagement/Sorting/SortingViewTemplate'});
+var view = Marionette.ItemView.extend({
+    template : 'Settings/MediaManagement/Sorting/SortingViewTemplate'
+});
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/Metadata/MetadataEditView.js

@@ -4,15 +4,16 @@ var AsModelBoundView = require('../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../Mixins/AsValidatedView');
 var AsEditModalView = require('../../Mixins/AsEditModalView');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Metadata/MetadataEditViewTemplate',
+
     _onAfterSave : function() {
         vent.trigger(vent.Commands.CloseModalCommand);
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/Metadata/MetadataItemView.js

@@ -3,18 +3,22 @@ var Marionette = require('marionette');
 var EditView = require('./MetadataEditView');
 var AsModelBoundView = require('../../Mixins/AsModelBoundView');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Metadata/MetadataItemViewTemplate',
     tagName  : 'li',
-        events     : {"click" : '_edit'},
+
+    events : {
+        'click' : '_edit'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _edit : function() {
         var view = new EditView({ model : this.model });
         AppLayout.modalRegion.show(view);
     }
 });
-    return AsModelBoundView.call(view);
-}).call(this);
+
+module.exports = AsModelBoundView.call(view);

src/UI/Settings/Metadata/MetadataLayout.js

@@ -4,7 +4,11 @@ var MetadataCollectionView = require('./MetadataCollectionView');
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/Metadata/MetadataLayoutTemplate',
-    regions    : {metadata : '#x-metadata-providers'},
+
+    regions : {
+        metadata : '#x-metadata-providers'
+    },
+
     initialize : function(options) {
         this.settings = options.settings;
         this.metadataCollection = new MetadataCollection();

src/UI/Settings/Notifications/Add/NotificationAddItemView.js

@@ -8,43 +8,55 @@ module.exports = Marionette.ItemView.extend({
     template  : 'Settings/Notifications/Add/NotificationAddItemViewTemplate',
     tagName   : 'li',
     className : 'add-thingy-item',
+
     events : {
-        "click .x-preset" : '_addPreset',
-        "click"           : '_add'
+        'click .x-preset' : '_addPreset',
+        'click'           : '_add'
     },
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     _addPreset : function(e) {
         var presetName = $(e.target).closest('.x-preset').attr('data-id');
+
         var presetData = _.where(this.model.get('presets'), { name : presetName })[0];
+
         this.model.set(presetData);
+
         this.model.set({
             id         : undefined,
             onGrab     : true,
             onDownload : true,
             onUpgrade  : true
         });
+
         var editView = new EditView({
             model            : this.model,
             targetCollection : this.targetCollection
         });
+
         AppLayout.modalRegion.show(editView);
     },
+
     _add : function(e) {
         if ($(e.target).closest('.btn,.btn-group').length !== 0) {
             return;
         }
+
         this.model.set({
             id         : undefined,
             onGrab     : true,
             onDownload : true,
             onUpgrade  : true
         });
+
         var editView = new EditView({
             model            : this.model,
             targetCollection : this.targetCollection
         });
+
         AppLayout.modalRegion.show(editView);
     }
 });

src/UI/Settings/Notifications/Delete/NotificationDeleteView.js

@@ -3,7 +3,10 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Notifications/Delete/NotificationDeleteViewTemplate',
-    events   : {"click .x-confirm-delete" : '_delete'},
+
+    events  : {
+        'click .x-confirm-delete' : '_delete'
+    },
     _delete : function() {
         this.model.destroy({
             wait    : true,

src/UI/Settings/Notifications/Edit/NotificationEditView.js

@@ -1,4 +1,4 @@
-var vent = require('vent');
+var vent = require('vent');
 var Marionette = require('marionette');
 var DeleteView = require('../Delete/NotificationDeleteView');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
@@ -7,22 +7,26 @@ var AsEditModalView = require('../../../Mixins/AsEditModalView');
 require('../../../Form/FormBuilder');
 require('../../../Mixins/TagInput');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Notifications/Edit/NotificationEditViewTemplate',
+
     ui : {
         onDownloadToggle : '.x-on-download',
         onUpgradeSection : '.x-on-upgrade',
         tags             : '.x-tags'
     },
+
     events : {
         'click .x-back'         : '_back',
         'change .x-on-download' : '_onDownloadChanged'
     },
+
     _deleteView : DeleteView,
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     onRender : function() {
         this._onDownloadChanged();
         this.ui.tags.tagInput({
@@ -30,32 +34,39 @@ module.exports = (function(){
             property : 'tags'
         });
     },
+
     _onAfterSave : function() {
         this.targetCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     },
+
     _onAfterSaveAndAdd : function() {
         this.targetCollection.add(this.model, { merge : true });
+
         require('../Add/NotificationSchemaModal').open(this.targetCollection);
     },
+
     _back : function() {
         if (this.model.isNew()) {
             this.model.destroy();
         }
+
         require('../Add/NotificationSchemaModal').open(this.targetCollection);
     },
+
     _onDownloadChanged : function() {
         var checked = this.ui.onDownloadToggle.prop('checked');
+
         if (checked) {
             this.ui.onUpgradeSection.show();
-            }
-            else {
+        } else {
             this.ui.onUpgradeSection.hide();
         }
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs

@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         {{#if id}}

src/UI/Settings/Notifications/NotificationCollectionView.js

@@ -6,11 +6,19 @@ module.exports = Marionette.CompositeView.extend({
     itemView          : ItemView,
     itemViewContainer : '.notification-list',
     template          : 'Settings/Notifications/NotificationCollectionViewTemplate',
-    ui                : {"addCard" : '.x-add-card'},
-    events            : {"click .x-add-card" : '_openSchemaModal'},
+
+    ui : {
+        'addCard' : '.x-add-card'
+    },
+
+    events : {
+        'click .x-add-card' : '_openSchemaModal'
+    },
+
     appendHtml : function(collectionView, itemView, index) {
         collectionView.ui.addCard.parent('li').before(itemView.el);
     },
+
     _openSchemaModal : function() {
         SchemaModal.open(this.collection);
     }

src/UI/Settings/Notifications/NotificationItemView.js

@@ -5,10 +5,15 @@ var EditView = require('./Edit/NotificationEditView');
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Notifications/NotificationItemViewTemplate',
     tagName  : 'li',
-    events     : {"click" : '_edit'},
+
+    events : {
+        'click' : '_edit'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _edit : function() {
         var view = new EditView({
             model            : this.model,

src/UI/Settings/Profile/AllowedLabeler.js

@@ -1,20 +1,19 @@
 var Handlebars = require('handlebars');
 var _ = require('underscore');
 
-module.exports = (function(){
 Handlebars.registerHelper('allowedLabeler', function() {
     var ret = '';
     var cutoff = this.cutoff;
+
     _.each(this.items, function(item) {
         if (item.allowed) {
             if (item.quality.id === cutoff.id) {
                 ret += '<li><span class="label label-info" title="Cutoff">' + item.quality.name + '</span></li>';
-                }
-                else {
+            } else {
                 ret += '<li><span class="label label-default">' + item.quality.name + '</span></li>';
             }
         }
     });
+
     return new Handlebars.SafeString(ret);
 });
-}).call(this);

src/UI/Settings/Profile/Delay/DelayProfileCollectionView.js

@@ -4,9 +4,10 @@ var DelayProfileItemView = require('./DelayProfileItemView');
 module.exports = BackboneSortableCollectionView.extend({
     className : 'delay-profiles',
     modelView : DelayProfileItemView,
+
     events : {
-        "click li, td"    : '_listItem_onMousedown',
-        "dblclick li, td" : '_listItem_onDoubleClick',
-        "keydown"         : '_onKeydown'
+        'click li, td'    : '_listItem_onMousedown',
+        'dblclick li, td' : '_listItem_onDoubleClick',
+        'keydown'         : '_onKeydown'
     }
 });

src/UI/Settings/Profile/Delay/DelayProfileItemView.js

@@ -6,10 +6,15 @@ var EditView = require('./Edit/DelayProfileEditView');
 module.exports = Marionette.ItemView.extend({
     template  : 'Settings/Profile/Delay/DelayProfileItemViewTemplate',
     className : 'row',
-    events     : {"click .x-edit" : '_edit'},
+
+    events : {
+        'click .x-edit' : '_edit'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _edit : function() {
         var view = new EditView({
             model            : this.model,

src/UI/Settings/Profile/Delay/DelayProfileLayout.js

@@ -1,4 +1,4 @@
-var $ = require('jquery');
+var $ = require('jquery');
 var _ = require('underscore');
 var vent = require('vent');
 var AppLayout = require('../../../AppLayout');
@@ -10,43 +10,65 @@ var Model = require('./DelayProfileModel');
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/Profile/Delay/DelayProfileLayoutTemplate',
-    regions                  : {delayProfiles : '.x-rows'},
-    events                   : {"click .x-add" : '_add'},
+
+    regions : {
+        delayProfiles : '.x-rows'
+    },
+
+    events : {
+        'click .x-add' : '_add'
+    },
+
     initialize : function(options) {
         this.collection = options.collection;
+
         this._updateOrderedCollection();
+
         this.listenTo(this.collection, 'sync', this._updateOrderedCollection);
         this.listenTo(this.collection, 'add', this._updateOrderedCollection);
         this.listenTo(this.collection, 'remove', function() {
             this.collection.fetch();
         });
     },
+
     onRender : function() {
+
         this.sortableListView = new DelayProfileCollectionView({
             sortable   : true,
             collection : this.orderedCollection,
-            sortableOptions      : {handle : '.x-drag-handle'},
+
+            sortableOptions : {
+                handle : '.x-drag-handle'
+            },
+
             sortableModelsFilter : function(model) {
                 return model.get('id') !== 1;
             }
         });
+
         this.delayProfiles.show(this.sortableListView);
+
         this.listenTo(this.sortableListView, 'sortStop', this._updateOrder);
     },
+
     _updateOrder : function() {
         var self = this;
+
         this.collection.forEach(function(model) {
             if (model.get('id') === 1) {
                 return;
             }
+
             var orderedModel = self.orderedCollection.get(model);
             var order = self.orderedCollection.indexOf(orderedModel) + 1;
+
             if (model.get('order') !== order) {
                 model.set('order', order);
                 model.save();
             }
         });
     },
+
     _add : function() {
         var model = new Model({
             enableUsenet      : true,
@@ -57,17 +79,21 @@ module.exports = Marionette.Layout.extend({
             order             : this.collection.length,
             tags              : []
         });
+
         model.collection = this.collection;
         var view = new EditView({
             model            : model,
             targetCollection : this.collection
         });
+
         AppLayout.modalRegion.show(view);
     },
+
     _updateOrderedCollection : function() {
         if (!this.orderedCollection) {
             this.orderedCollection = new Backbone.Collection();
         }
+
         this.orderedCollection.reset(_.sortBy(this.collection.models, function(model) {
             return model.get('order');
         }));

src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteView.js

@@ -3,9 +3,14 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate',
-    events   : {"click .x-confirm-delete" : '_delete'},
+
+    events : {
+        'click .x-confirm-delete' : '_delete'
+    },
+
     _delete : function() {
         var collection = this.model.collection;
+
         this.model.destroy({
             wait    : true,
             success : function() {

src/UI/Settings/Profile/Delay/Edit/DelayProfileEditView.js

@@ -1,4 +1,4 @@
-var vent = require('vent');
+var vent = require('vent');
 var AppLayout = require('../../../../AppLayout');
 var Marionette = require('marionette');
 var DeleteView = require('../Delete/DelayProfileDeleteView');
@@ -8,20 +8,26 @@ var AsEditModalView = require('../../../../Mixins/AsEditModalView');
 require('../../../../Mixins/TagInput');
 require('bootstrap');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate',
+
     _deleteView : DeleteView,
+
     ui : {
         tags         : '.x-tags',
         usenetDelay  : '.x-usenet-delay',
         torrentDelay : '.x-torrent-delay',
         protocol     : '.x-protocol'
     },
-        events          : {"change .x-protocol" : '_updateModel'},
+
+    events : {
+        'change .x-protocol' : '_updateModel'
+    },
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     },
+
     onRender : function() {
         if (this.model.id !== 1) {
             this.ui.tags.tagInput({
@@ -29,14 +35,18 @@ module.exports = (function(){
                 property : 'tags'
             });
         }
+
         this._toggleControls();
     },
+
     _onAfterSave : function() {
         this.targetCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     },
+
     _updateModel : function() {
         var protocol = this.ui.protocol.val();
+
         if (protocol === 'preferUsenet') {
             this.model.set({
                 enableUsenet      : true,
@@ -44,6 +54,7 @@ module.exports = (function(){
                 preferredProtocol : 'usenet'
             });
         }
+
         if (protocol === 'preferTorrent') {
             this.model.set({
                 enableUsenet      : true,
@@ -51,6 +62,7 @@ module.exports = (function(){
                 preferredProtocol : 'torrent'
             });
         }
+
         if (protocol === 'onlyUsenet') {
             this.model.set({
                 enableUsenet      : true,
@@ -58,6 +70,7 @@ module.exports = (function(){
                 preferredProtocol : 'usenet'
             });
         }
+
         if (protocol === 'onlyTorrent') {
             this.model.set({
                 enableUsenet      : false,
@@ -65,36 +78,45 @@ module.exports = (function(){
                 preferredProtocol : 'torrent'
             });
         }
+
         this._toggleControls();
     },
+
     _toggleControls : function() {
         var enableUsenet = this.model.get('enableUsenet');
         var enableTorrent = this.model.get('enableTorrent');
         var preferred = this.model.get('preferredProtocol');
+
         if (preferred === 'usenet') {
             this.ui.protocol.val('preferUsenet');
         }
+
         else {
             this.ui.protocol.val('preferTorrent');
         }
+
         if (enableUsenet) {
             this.ui.usenetDelay.show();
         }
+
         else {
             this.ui.protocol.val('onlyTorrent');
             this.ui.usenetDelay.hide();
         }
+
         if (enableTorrent) {
             this.ui.torrentDelay.show();
         }
+
         else {
             this.ui.protocol.val('onlyUsenet');
             this.ui.torrentDelay.hide();
         }
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
 AsEditModalView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;

src/UI/Settings/Profile/DeleteProfileView.js

@@ -3,7 +3,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
     template : 'Settings/Profile/DeleteProfileViewTemplate',
-    events         : {"click .x-confirm-delete" : '_removeProfile'},
+
+    events : {
+        'click .x-confirm-delete' : '_removeProfile'
+    },
+
     _removeProfile : function() {
         this.model.destroy({ wait : true }).done(function() {
             vent.trigger(vent.Commands.CloseModalCommand);

src/UI/Settings/Profile/Edit/EditProfileItemView.js

@@ -1,3 +1,5 @@
 var Marionette = require('marionette');
 
-module.exports = Marionette.ItemView.extend({template : 'Settings/Profile/Edit/EditProfileItemViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'Settings/Profile/Edit/EditProfileItemViewTemplate'
+});

src/UI/Settings/Profile/Edit/EditProfileLayout.js

@@ -1,4 +1,4 @@
-var _ = require('underscore');
+var _ = require('underscore');
 var vent = require('vent');
 var AppLayout = require('../../../AppLayout');
 var Marionette = require('marionette');
@@ -11,58 +11,77 @@ var SeriesCollection = require('../../../Series/SeriesCollection');
 var Config = require('../../../Config');
 var AsEditModalView = require('../../../Mixins/AsEditModalView');
 
-module.exports = (function(){
 var view = Marionette.Layout.extend({
     template : 'Settings/Profile/Edit/EditProfileLayoutTemplate',
+
     regions : {
         fields    : '#x-fields',
         qualities : '#x-qualities'
     },
-        ui                   : {deleteButton : '.x-delete'},
+
+    ui : {
+        deleteButton : '.x-delete'
+    },
+
     _deleteView : DeleteView,
+
     initialize : function(options) {
         this.profileCollection = options.profileCollection;
         this.itemsCollection = new Backbone.Collection(_.toArray(this.model.get('items')).reverse());
         this.listenTo(SeriesCollection, 'all', this._updateDisableStatus);
     },
+
     onRender : function() {
         this._updateDisableStatus();
     },
+
     onShow : function() {
         this.fieldsView = new EditProfileView({ model : this.model });
         this._showFieldsView();
         var advancedShown = Config.getValueBoolean(Config.Keys.AdvancedSettings, false);
+
         this.sortableListView = new QualitySortableCollectionView({
             selectable     : true,
             selectMultiple : true,
             clickToSelect  : true,
             clickToToggle  : true,
             sortable       : advancedShown,
-                sortableOptions     : {handle : '.x-drag-handle'},
+
+            sortableOptions : {
+                handle : '.x-drag-handle'
+            },
+
             visibleModelsFilter : function(model) {
                 return model.get('quality').id !== 0 || advancedShown;
             },
+
             collection : this.itemsCollection,
             model      : this.model
         });
+
         this.sortableListView.setSelectedModels(this.itemsCollection.filter(function(item) {
             return item.get('allowed') === true;
         }));
         this.qualities.show(this.sortableListView);
+
         this.listenTo(this.sortableListView, 'selectionChanged', this._selectionChanged);
         this.listenTo(this.sortableListView, 'sortStop', this._updateModel);
     },
+
     _onBeforeSave : function() {
         var cutoff = this.fieldsView.getCutoff();
         this.model.set('cutoff', cutoff);
     },
+
     _onAfterSave : function() {
         this.profileCollection.add(this.model, { merge : true });
         vent.trigger(vent.Commands.CloseModalCommand);
     },
+
     _selectionChanged : function(newSelectedModels, oldSelectedModels) {
         var addedModels = _.difference(newSelectedModels, oldSelectedModels);
         var removeModels = _.difference(oldSelectedModels, newSelectedModels);
+
         _.each(removeModels, function(item) {
             item.set('allowed', false);
         });
@@ -71,25 +90,28 @@ module.exports = (function(){
         });
         this._updateModel();
     },
+
     _updateModel : function() {
         this.model.set('items', this.itemsCollection.toJSON().reverse());
+
         this._showFieldsView();
     },
+
     _showFieldsView : function() {
         this.fields.show(this.fieldsView);
     },
+
     _updateDisableStatus : function() {
         if (this._isQualityInUse()) {
             this.ui.deleteButton.addClass('disabled');
             this.ui.deleteButton.attr('title', 'Can\'t delete a profile that is attached to a series.');
-            }
-            else {
+        } else {
             this.ui.deleteButton.removeClass('disabled');
         }
     },
+
     _isQualityInUse : function() {
-            return SeriesCollection.where({"profileId" : this.model.id}).length !== 0;
+        return SeriesCollection.where({ 'profileId' : this.model.id }).length !== 0;
     }
 });
-    return AsEditModalView.call(view);
-}).call(this);
+module.exports = AsEditModalView.call(view);

src/UI/Settings/Profile/Edit/EditProfileView.js

@@ -5,18 +5,24 @@ var Config = require('../../../Config');
 var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../../Mixins/AsValidatedView');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Profile/Edit/EditProfileViewTemplate',
+
     ui : { cutoff : '.x-cutoff' },
+
     templateHelpers : function() {
-            return {languages : LanguageCollection.toJSON()};
+        return {
+            languages : LanguageCollection.toJSON()
+        };
     },
+
     getCutoff : function() {
         var self = this;
+
         return _.findWhere(_.pluck(this.model.get('items'), 'quality'), { id : parseInt(self.ui.cutoff.val(), 10) });
     }
 });
+
 AsValidatedView.call(view);
-    return AsModelBoundView.call(view);
-}).call(this);
+
+module.exports = AsModelBoundView.call(view);

src/UI/Settings/Profile/Edit/QualitySortableCollectionView.js

@@ -4,10 +4,14 @@ var EditProfileItemView = require('./EditProfileItemView');
 module.exports = BackboneSortableCollectionView.extend({
     className : 'qualities',
     modelView : EditProfileItemView,
-    attributes : {"validation-name" : 'items'},
+
+    attributes : {
+        'validation-name' : 'items'
+    },
+
     events : {
-        "click li, td"    : '_listItem_onMousedown',
-        "dblclick li, td" : '_listItem_onDoubleClick',
-        "keydown"         : '_onKeydown'
+        'click li, td'    : '_listItem_onMousedown',
+        'dblclick li, td' : '_listItem_onDoubleClick',
+        'keydown'         : '_onKeydown'
     }
 });

src/UI/Settings/Profile/Language/LanguageCollection.js

@@ -1,12 +1,12 @@
 var Backbone = require('backbone');
 var LanguageModel = require('./LanguageModel');
 
-module.exports = (function(){
 var LanuageCollection = Backbone.Collection.extend({
     model : LanguageModel,
     url   : window.NzbDrone.ApiRoot + '/language'
 });
+
 var languages = new LanuageCollection();
 languages.fetch();
-    return languages;
-}).call(this);
+
+module.exports = languages;

src/UI/Settings/Profile/LanguageLabel.js

@@ -2,13 +2,14 @@ var _ = require('underscore');
 var Handlebars = require('handlebars');
 var LanguageCollection = require('./Language/LanguageCollection');
 
-module.exports = (function(){
 Handlebars.registerHelper('languageLabel', function() {
     var wantedLanguage = this.language;
+
     var language = LanguageCollection.find(function(lang) {
         return lang.get('nameLower') === wantedLanguage;
     });
+
     var result = '<span class="label label-primary">' + language.get('name') + '</span>';
+
     return new Handlebars.SafeString(result);
 });
-}).call(this);

src/UI/Settings/Profile/ProfileCollectionView.js

@@ -9,11 +9,19 @@ module.exports = Marionette.CompositeView.extend({
     itemView          : ProfileView,
     itemViewContainer : '.profiles',
     template          : 'Settings/Profile/ProfileCollectionTemplate',
-    ui                : {"addCard" : '.x-add-card'},
-    events            : {"click .x-add-card" : '_addProfile'},
+
+    ui : {
+        'addCard' : '.x-add-card'
+    },
+
+    events : {
+        'click .x-add-card' : '_addProfile'
+    },
+
     appendHtml : function(collectionView, itemView, index) {
         collectionView.ui.addCard.parent('li').before(itemView.el);
     },
+
     _addProfile : function() {
         var self = this;
         var schemaCollection = new ProfileCollection();
@@ -27,6 +35,7 @@ module.exports = Marionette.CompositeView.extend({
                     model             : model,
                     profileCollection : self.collection
                 });
+
                 AppLayout.modalRegion.show(view);
             }
         });

src/UI/Settings/Profile/ProfileLayout.js

@@ -7,16 +7,20 @@ var LanguageCollection = require('./Language/LanguageCollection');
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/Profile/ProfileLayoutTemplate',
+
     regions : {
         profile      : '#profile',
         delayProfile : '#delay-profile'
     },
+
     initialize : function(options) {
         this.settings = options.settings;
         ProfileCollection.fetch();
+
         this.delayProfileCollection = new DelayProfileCollection();
         this.delayProfileCollection.fetch();
     },
+
     onShow : function() {
         this.profile.show(new ProfileCollectionView({ collection : ProfileCollection }));
         this.delayProfile.show(new DelayProfileLayout({ collection : this.delayProfileCollection }));

src/UI/Settings/Profile/ProfileView.js

@@ -6,18 +6,23 @@ require('./AllowedLabeler');
 require('./LanguageLabel');
 require('bootstrap');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/Profile/ProfileViewTemplate',
     tagName  : 'li',
+
     ui : {
         "progressbar"  : '.progress .bar',
         "deleteButton" : '.x-delete'
     },
-        events       : {"click" : '_editProfile'},
+
+    events : {
+        'click' : '_editProfile'
+    },
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this.render);
     },
+
     _editProfile : function() {
         var view = new EditProfileView({
             model             : this.model,
@@ -26,5 +31,5 @@ module.exports = (function(){
         AppLayout.modalRegion.show(view);
     }
 });
-    return AsModelBoundView.call(view);
-}).call(this);
+
+module.exports = AsModelBoundView.call(view);

src/UI/Settings/ProviderSettingsModelBase.js

@@ -5,22 +5,29 @@ var Messenger = require('../Shared/Messenger');
 module.exports = DeepModel.DeepModel.extend({
     test : function() {
         var self = this;
+
         this.trigger('validation:sync');
+
         var params = {};
+
         params.url = this.collection.url + '/test';
         params.contentType = 'application/json';
         params.data = JSON.stringify(this.toJSON());
         params.type = 'POST';
         params.isValidatedCall = true;
+
         var promise = $.ajax(params);
+
         Messenger.monitor({
             promise        : promise,
             successMessage : 'Testing \'{0}\' completed'.format(this.get('name')),
             errorMessage   : 'Testing \'{0}\' failed'.format(this.get('name'))
         });
+
         promise.fail(function(response) {
             self.trigger('validation:failed', response);
         });
+
         return promise;
     }
 });

src/UI/Settings/Quality/Definition/QualityDefinitionCollectionView.js

@@ -3,6 +3,8 @@ var QualityDefinitionItemView = require('./QualityDefinitionItemView');
 
 module.exports = Marionette.CompositeView.extend({
     template : 'Settings/Quality/Definition/QualityDefinitionCollectionTemplate',
+
     itemViewContainer : '.x-rows',
+
     itemView : QualityDefinitionItemView
 });

src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js

@@ -3,10 +3,10 @@ var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var fileSize = require('filesize');
 require('jquery-ui');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template  : 'Settings/Quality/Definition/QualityDefinitionItemViewTemplate',
     className : 'row',
+
     ui : {
         sizeSlider          : '.x-slider',
         thirtyMinuteMinSize : '.x-min-thirty',
@@ -14,51 +14,76 @@ module.exports = (function(){
         thirtyMinuteMaxSize : '.x-max-thirty',
         sixtyMinuteMaxSize  : '.x-max-sixty'
     },
-        events      : {"slide .x-slider" : '_updateSize'},
+
+    events : {
+        'slide .x-slider' : '_updateSize'
+    },
+
     initialize : function(options) {
         this.profileCollection = options.profiles;
         this.filesize = fileSize;
     },
+
     onRender : function() {
         if (this.model.get('quality').id === 0) {
             this.$el.addClass('row advanced-setting');
         }
+
         this.ui.sizeSlider.slider({
             range  : true,
             min    : 0,
             max    : 200,
-                values : [this.model.get('minSize'), this.model.get('maxSize')]
+            values : [
+                this.model.get('minSize'),
+                this.model.get('maxSize')
+            ]
         });
+
         this._changeSize();
     },
+
     _updateSize : function(event, ui) {
         this.model.set('minSize', ui.values[0]);
         this.model.set('maxSize', ui.values[1]);
+
         this._changeSize();
     },
+
     _changeSize : function() {
         var minSize = this.model.get('minSize');
         var maxSize = this.model.get('maxSize');
+
         {
             var minBytes = minSize * 1024 * 1024;
             var minThirty = fileSize(minBytes * 30, 1, false);
             var minSixty = fileSize(minBytes * 60, 1, false);
+
             this.ui.thirtyMinuteMinSize.html(minThirty);
             this.ui.sixtyMinuteMinSize.html(minSixty);
         }
+
         {
             if (maxSize === 0) {
                 this.ui.thirtyMinuteMaxSize.html('Unlimited');
                 this.ui.sixtyMinuteMaxSize.html('Unlimited');
+
                 return;
             }
+
             var maxBytes = maxSize * 1024 * 1024;
             var maxThirty = fileSize(maxBytes * 30, 1, false);
             var maxSixty = fileSize(maxBytes * 60, 1, false);
+
             this.ui.thirtyMinuteMaxSize.html(maxThirty);
             this.ui.sixtyMinuteMaxSize.html(maxSixty);
         }
+        /*if (parseInt(maxSize, 10) === 0) {
+         thirty = 'No Limit';
+         sixty = 'No Limit';
+         }*/
     }
 });
-    return AsModelBoundView.call(view);
-}).call(this);
+
+view = AsModelBoundView.call(view);
+
+module.exports = view;

src/UI/Settings/Quality/QualityLayout.js

@@ -4,12 +4,17 @@ var QualityDefinitionCollectionView = require('./Definition/QualityDefinitionCol
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/Quality/QualityLayoutTemplate',
-    regions    : {qualityDefinition : '#quality-definition'},
+
+    regions : {
+        qualityDefinition : '#quality-definition'
+    },
+
     initialize : function(options) {
         this.settings = options.settings;
         this.qualityDefinitionCollection = new QualityDefinitionCollection();
         this.qualityDefinitionCollection.fetch();
     },
+
     onShow : function() {
         this.qualityDefinition.show(new QualityDefinitionCollectionView({ collection : this.qualityDefinitionCollection }));
     }

src/UI/Settings/SettingsLayout.js

@@ -25,6 +25,7 @@ var Config = require('../Config');
 
 module.exports = Marionette.Layout.extend({
     template : 'Settings/SettingsLayoutTemplate',
+
     regions : {
         mediaManagement : '#media-management',
         profiles        : '#profiles',
@@ -37,6 +38,7 @@ module.exports = Marionette.Layout.extend({
         uiRegion        : '#ui',
         loading         : '#loading-region'
     },
+
     ui : {
         mediaManagementTab : '.x-media-management-tab',
         profilesTab        : '.x-profiles-tab',
@@ -49,28 +51,33 @@ module.exports = Marionette.Layout.extend({
         uiTab              : '.x-ui-tab',
         advancedSettings   : '.x-advanced-settings'
     },
+
     events : {
-        "click .x-media-management-tab" : '_showMediaManagement',
-        "click .x-profiles-tab"         : '_showProfiles',
-        "click .x-quality-tab"          : '_showQuality',
-        "click .x-indexers-tab"         : '_showIndexers',
-        "click .x-download-client-tab"  : '_showDownloadClient',
-        "click .x-notifications-tab"    : '_showNotifications',
-        "click .x-metadata-tab"         : '_showMetadata',
-        "click .x-general-tab"          : '_showGeneral',
-        "click .x-ui-tab"               : '_showUi',
-        "click .x-save-settings"        : '_save',
-        "change .x-advanced-settings"   : '_toggleAdvancedSettings'
+        'click .x-media-management-tab' : '_showMediaManagement',
+        'click .x-profiles-tab'         : '_showProfiles',
+        'click .x-quality-tab'          : '_showQuality',
+        'click .x-indexers-tab'         : '_showIndexers',
+        'click .x-download-client-tab'  : '_showDownloadClient',
+        'click .x-notifications-tab'    : '_showNotifications',
+        'click .x-metadata-tab'         : '_showMetadata',
+        'click .x-general-tab'          : '_showGeneral',
+        'click .x-ui-tab'               : '_showUi',
+        'click .x-save-settings'        : '_save',
+        'change .x-advanced-settings'   : '_toggleAdvancedSettings'
     },
+
     initialize : function(options) {
         if (options.action) {
             this.action = options.action.toLowerCase();
         }
+
         this.listenTo(vent, vent.Hotkeys.SaveSettings, this._save);
     },
+
     onRender : function() {
         this.loading.show(new LoadingView());
         var self = this;
+
         this.mediaManagementSettings = new MediaManagementSettingsModel();
         this.namingSettings = new NamingModel();
         this.indexerSettings = new IndexerSettingsModel();
@@ -78,7 +85,8 @@ module.exports = Marionette.Layout.extend({
         this.notificationCollection = new NotificationCollection();
         this.generalSettings = new GeneralSettingsModel();
         this.uiSettings = new UiSettingsModel();
-        Backbone.$.when(this.mediaManagementSettings.fetch(), this.namingSettings.fetch(), this.indexerSettings.fetch(), this.downloadClientSettings.fetch(), this.notificationCollection.fetch(), this.generalSettings.fetch(), this.uiSettings.fetch()).done(function(){
+        Backbone.$.when(this.mediaManagementSettings.fetch(), this.namingSettings.fetch(), this.indexerSettings.fetch(), this.downloadClientSettings.fetch(),
+            this.notificationCollection.fetch(), this.generalSettings.fetch(), this.uiSettings.fetch()).done(function() {
                 if (!self.isClosed) {
                     self.loading.$el.hide();
                     self.mediaManagement.show(new MediaManagementLayout({
@@ -95,8 +103,10 @@ module.exports = Marionette.Layout.extend({
                     self.uiRegion.show(new UiView({ model : self.uiSettings }));
                 }
             });
+
         this._setAdvancedSettingsState();
     },
+
     onShow : function() {
         switch (this.action) {
             case 'profiles':
@@ -130,48 +140,61 @@ module.exports = Marionette.Layout.extend({
                 this._showMediaManagement();
         }
     },
+
     _showMediaManagement : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.mediaManagementTab.tab('show');
         this._navigate('settings/mediamanagement');
     },
+
     _showProfiles : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.profilesTab.tab('show');
         this._navigate('settings/profiles');
     },
+
     _showQuality : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.qualityTab.tab('show');
         this._navigate('settings/quality');
     },
+
     _showIndexers : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.indexersTab.tab('show');
         this._navigate('settings/indexers');
     },
+
     _showDownloadClient : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.downloadClientTab.tab('show');
         this._navigate('settings/downloadclient');
     },
+
     _showNotifications : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.notificationsTab.tab('show');
         this._navigate('settings/connect');
     },
+
     _showMetadata : function(e) {
         if (e) {
             e.preventDefault();
@@ -179,6 +202,7 @@ module.exports = Marionette.Layout.extend({
         this.ui.metadataTab.tab('show');
         this._navigate('settings/metadata');
     },
+
     _showGeneral : function(e) {
         if (e) {
             e.preventDefault();
@@ -186,6 +210,7 @@ module.exports = Marionette.Layout.extend({
         this.ui.generalTab.tab('show');
         this._navigate('settings/general');
     },
+
     _showUi : function(e) {
         if (e) {
             e.preventDefault();
@@ -193,29 +218,34 @@ module.exports = Marionette.Layout.extend({
         this.ui.uiTab.tab('show');
         this._navigate('settings/ui');
     },
+
     _navigate : function(route) {
         Backbone.history.navigate(route, {
             trigger : false,
             replace : true
         });
     },
+
     _save : function() {
         vent.trigger(vent.Commands.SaveSettings);
     },
+
     _setAdvancedSettingsState : function() {
         var checked = Config.getValueBoolean(Config.Keys.AdvancedSettings);
         this.ui.advancedSettings.prop('checked', checked);
+
         if (checked) {
             $('body').addClass('show-advanced-settings');
         }
     },
+
     _toggleAdvancedSettings : function() {
         var checked = this.ui.advancedSettings.prop('checked');
         Config.setValue(Config.Keys.AdvancedSettings, checked);
+
         if (checked) {
             $('body').addClass('show-advanced-settings');
-        }
-        else {
+        } else {
             $('body').removeClass('show-advanced-settings');
         }
     }

src/UI/Settings/SettingsModelBase.js

@@ -3,27 +3,32 @@ var DeepModel = require('backbone.deepmodel');
 var AsChangeTrackingModel = require('../Mixins/AsChangeTrackingModel');
 var Messenger = require('../Shared/Messenger');
 
-module.exports = (function(){
 var model = DeepModel.DeepModel.extend({
+
     initialize : function() {
         this.listenTo(vent, vent.Commands.SaveSettings, this.saveSettings);
         this.listenTo(this, 'destroy', this._stopListening);
     },
+
     saveSettings : function() {
         if (!this.isSaved) {
             var savePromise = this.save();
+
             Messenger.monitor({
                 promise        : savePromise,
                 successMessage : this.successMessage,
                 errorMessage   : this.errorMessage
             });
+
             return savePromise;
         }
+
         return undefined;
     },
+
     _stopListening : function() {
         this.stopListening(vent, vent.Commands.SaveSettings);
     }
 });
-    return AsChangeTrackingModel.call(model);
-}).call(this);
+
+module.exports = AsChangeTrackingModel.call(model);

src/UI/Settings/ThingyAddCollectionView.js

@@ -2,8 +2,11 @@ var Marionette = require('marionette');
 
 module.exports = Marionette.CompositeView.extend({
     itemViewOptions : function() {
-        return {targetCollection : this.targetCollection || this.options.targetCollection};
+        return {
+            targetCollection : this.targetCollection || this.options.targetCollection
+        };
     },
+
     initialize : function(options) {
         this.targetCollection = options.targetCollection;
     }

src/UI/Settings/ThingyHeaderGroupView.js

@@ -5,9 +5,13 @@ module.exports = Marionette.CompositeView.extend({
     itemViewContainer : '.item-list',
     template          : 'Settings/ThingyHeaderGroupViewTemplate',
     tagName           : 'div',
+
     itemViewOptions : function() {
-        return {targetCollection : this.targetCollection || this.options.targetCollection};
+        return {
+            targetCollection : this.targetCollection || this.options.targetCollection
+        };
     },
+
     initialize : function() {
         this.collection = new Backbone.Collection(this.model.get('collection'));
     }

src/UI/Settings/UI/UiView.js

@@ -1,20 +1,22 @@
-var vent = require('vent');
+var vent = require('vent');
 var Marionette = require('marionette');
 var UiSettingsModel = require('../../Shared/UiSettingsModel');
 var AsModelBoundView = require('../../Mixins/AsModelBoundView');
 var AsValidatedView = require('../../Mixins/AsValidatedView');
 
-module.exports = (function(){
 var view = Marionette.ItemView.extend({
     template : 'Settings/UI/UiViewTemplate',
+
     initialize : function() {
         this.listenTo(this.model, 'sync', this._reloadUiSettings);
     },
+
     _reloadUiSettings : function() {
         UiSettingsModel.fetch();
     }
 });
+
 AsModelBoundView.call(view);
 AsValidatedView.call(view);
-    return view;
-}).call(this);
+
+module.exports = view;