UI Cleanup - Updated System, Tags and Wanted subtrees.

src/UI/System/Backup/BackupCollection.js

@@ -4,10 +4,12 @@ var BackupModel = require('./BackupModel');
 module.exports = PageableCollection.extend({
     url   : window.NzbDrone.ApiRoot + '/system/backup',
     model : BackupModel,
+
     state : {
         sortKey  : 'time',
         order    : 1,
         pageSize : 100000
     },
+
     mode : 'client'
 });

src/UI/System/Backup/BackupEmptyView.js

@@ -1,3 +1,5 @@
 var Marionette = require('marionette');
 
-module.exports = Marionette.ItemView.extend({template : 'System/Backup/BackupEmptyViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'System/Backup/BackupEmptyViewTemplate'
+});

src/UI/System/Backup/BackupLayout.js

@@ -11,54 +11,67 @@ var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Backup/BackupLayoutTemplate',
+
     regions : {
         backups : '#x-backups',
         toolbar : '#x-backup-toolbar'
     },
-    columns          : [{
+
+    columns : [
+        {
             name     : 'type',
             label    : '',
             sortable : false,
             cell     : BackupTypeCell
-    }, {
+        },
+        {
             name     : 'this',
             label    : 'Name',
             sortable : false,
             cell     : BackupFilenameCell
-    }, {
+        },
+        {
             name     : 'time',
             label    : 'Time',
             sortable : false,
             cell     : RelativeDateCell
-    }],
+        }
+    ],
+
     leftSideButtons : {
         type       : 'default',
         storeState : false,
         collapse   : false,
-        items      : [{
+        items      : [
+            {
                 title          : 'Backup',
                 icon           : 'icon-file-text',
                 command        : 'backup',
                 properties     : { type : 'manual' },
                 successMessage : 'Database and settings were backed up successfully',
                 errorMessage   : 'Backup Failed!'
-        }]
+            }
+        ]
     },
+
     initialize : function() {
         this.backupCollection = new BackupCollection();
+
         this.listenTo(this.backupCollection, 'sync', this._showBackups);
         this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
     },
+
     onRender : function() {
         this._showToolbar();
         this.backups.show(new LoadingView());
+
         this.backupCollection.fetch();
     },
+
     _showBackups : function() {
         if (this.backupCollection.length === 0) {
             this.backups.show(new EmptyView());
-        }
+        } else {
-        else {
             this.backups.show(new Backgrid.Grid({
                 columns    : this.columns,
                 collection : this.backupCollection,
@@ -66,6 +79,7 @@ module.exports = Marionette.Layout.extend({
             }));
         }
     },
+
     _showToolbar     : function() {
         this.toolbar.show(new ToolbarLayout({
             left    : [this.leftSideButtons],

src/UI/System/Backup/BackupTypeCell.js

@@ -2,20 +2,25 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'backup-type-cell',
+
     render : function() {
         this.$el.empty();
+
         var icon = 'icon-time';
         var title = 'Scheduled';
+
         var type = this.model.get(this.column.get('name'));
+
         if (type === 'manual') {
             icon = 'icon-book';
             title = 'Manual';
-        }
+        } else if (type === 'update') {
-        else if(type === 'update') {
             icon = 'icon-retweet';
             title = 'Before update';
         }
+
         this.$el.html('<i class="{0}" title="{1}"></i>'.format(icon, title));
+
         return this;
     }
 });

src/UI/System/Info/About/AboutView.js

@@ -3,6 +3,7 @@ var StatusModel = require('../../StatusModel');
 
 module.exports = Marionette.ItemView.extend({
     template : 'System/Info/About/AboutViewTemplate',
+
     initialize : function() {
         this.model = StatusModel;
     }

src/UI/System/Info/DiskSpace/DiskSpaceLayout.js

@@ -1,4 +1,4 @@
-var vent = require('vent');
+var vent = require('vent');
 var Marionette = require('marionette');
 var Backgrid = require('backgrid');
 var DiskSpaceCollection = require('./DiskSpaceCollection');
@@ -8,33 +8,45 @@ var FileSizeCell = require('../../../Cells/FileSizeCell');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Info/DiskSpace/DiskSpaceLayoutTemplate',
-    regions    : {grid : '#x-grid'},
+
-    columns    : [{
+    regions : {
+        grid : '#x-grid'
+    },
+
+    columns : [
+        {
             name     : 'path',
             label    : 'Location',
             cell     : DiskSpacePathCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'freeSpace',
             label    : 'Free Space',
             cell     : FileSizeCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'totalSpace',
             label    : 'Total Space',
             cell     : FileSizeCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function() {
         this.collection = new DiskSpaceCollection();
         this.listenTo(this.collection, 'sync', this._showTable);
     },
+
     onRender : function() {
         this.grid.show(new LoadingView());
     },
+
     onShow : function() {
         this.collection.fetch();
     },
+
     _showTable : function() {
         this.grid.show(new Backgrid.Grid({
             row        : Backgrid.Row,

src/UI/System/Info/DiskSpace/DiskSpacePathCell.js

@@ -2,15 +2,21 @@ var Backgrid = require('backgrid');
 
 module.exports = Backgrid.Cell.extend({
     className : 'disk-space-path-cell',
+
     render : function() {
         this.$el.empty();
+
         var path = this.model.get('path');
         var label = this.model.get('label');
+
         var contents = path;
+
         if (label) {
             contents += ' ({0})'.format(label);
         }
+
         this.$el.html(contents);
+
         return this;
     }
 });

src/UI/System/Info/Health/HealthCell.js

@@ -2,9 +2,11 @@ var NzbDroneCell = require('../../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'log-level-cell',
+
     render : function() {
         var level = this._getValue();
         this.$el.html('<i class="icon-nd-health-{0}" title="{1}"/>'.format(this._getValue().toLowerCase(), level));
+
         return this;
     }
 });

src/UI/System/Info/Health/HealthLayout.js

@@ -7,35 +7,45 @@ var HealthOkView = require('./HealthOkView');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Info/Health/HealthLayoutTemplate',
-    regions    : {grid : '#x-health-grid'},
+
-    columns    : [{
+    regions : {
+        grid : '#x-health-grid'
+    },
+
+    columns : [
+        {
             name     : 'type',
             label    : '',
             cell     : HealthCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'message',
             label    : 'Message',
             cell     : 'string',
             sortable : false
-    }, {
+        },
+        {
             name     : 'wikiUrl',
             label    : '',
             cell     : HealthWikiCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function() {
         this.listenTo(HealthCollection, 'sync', this.render);
         HealthCollection.fetch();
     },
+
     onRender : function() {
         if (HealthCollection.length === 0) {
             this.grid.show(new HealthOkView());
-        }
+        } else {
-        else {
             this._showTable();
         }
     },
+
     _showTable : function() {
         this.grid.show(new Backgrid.Grid({
             row        : Backgrid.Row,

src/UI/System/Info/Health/HealthOkView.js

@@ -1,3 +1,5 @@
 var Marionette = require('marionette');
 
-module.exports = Marionette.ItemView.extend({template : 'System/Info/Health/HealthOkViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'System/Info/Health/HealthOkViewTemplate'
+});

src/UI/System/Info/Health/HealthWikiCell.js

@@ -3,8 +3,11 @@ var Backgrid = require('backgrid');
 
 module.exports = Backgrid.UriCell.extend({
     className : 'wiki-link-cell',
+
     title : 'Read the Wiki for more information',
+
     text : 'Wiki',
+
     render : function() {
         this.$el.empty();
         var rawValue = this.model.get(this.column.get('name'));

src/UI/System/Info/MoreInfo/MoreInfoView.js

@@ -1,3 +1,5 @@
 var Marionette = require('marionette');
 
-module.exports = Marionette.ItemView.extend({template : 'System/Info/MoreInfo/MoreInfoViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'System/Info/MoreInfo/MoreInfoViewTemplate'
+});

src/UI/System/Info/SystemInfoLayout.js

@@ -7,12 +7,14 @@ var MoreInfoView = require('./MoreInfo/MoreInfoView');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Info/SystemInfoLayoutTemplate',
+
     regions : {
         about     : '#about',
         diskSpace : '#diskspace',
         health    : '#health',
         moreInfo  : '#more-info'
     },
+
     onRender : function() {
         this.health.show(new HealthLayout());
         this.diskSpace.show(new DiskSpaceLayout());

src/UI/System/Logs/Files/ContentsModel.js

@@ -4,6 +4,7 @@ module.exports = Backbone.Model.extend({
     url : function() {
         return this.get('contentsUrl');
     },
+
     parse : function(contents) {
         var response = {};
         response.contents = contents;

src/UI/System/Logs/Files/ContentsView.js

@@ -1,3 +1,5 @@
 var Marionette = require('marionette');
 
-module.exports = Marionette.ItemView.extend({template : 'System/Logs/Files/ContentsViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'System/Logs/Files/ContentsViewTemplate'
+});

src/UI/System/Logs/Files/DownloadLogCell.js

@@ -2,9 +2,11 @@ var NzbDroneCell = require('../../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'download-log-cell',
+
     render : function() {
         this.$el.empty();
         this.$el.html('<a href="{0}" class="no-router" target="_blank">Download</a>'.format(this.cellValue));
+
         return this;
     }
 });

src/UI/System/Logs/Files/FilenameCell.js

@@ -2,9 +2,11 @@ var NzbDroneCell = require('../../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'log-filename-cell',
+
     render : function() {
         var filename = this._getValue();
         this.$el.html(filename);
+
         return this;
     }
 });

src/UI/System/Logs/Files/LogFileCollection.js

@@ -4,6 +4,7 @@ var LogFileModel = require('./LogFileModel');
 module.exports = Backbone.Collection.extend({
     url   : window.NzbDrone.ApiRoot + '/log/file',
     model : LogFileModel,
+
     state : {
         sortKey : 'lastWriteTime',
         order   : 1

src/UI/System/Logs/Files/LogFileLayout.js

@@ -13,61 +13,77 @@ require('../../../jQuery/jquery.spin');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Logs/Files/LogFileLayoutTemplate',
+
     regions : {
         toolbar  : '#x-toolbar',
         grid     : '#x-grid',
         contents : '#x-contents'
     },
-    columns               : [{
+
+    columns : [
+        {
             name     : 'filename',
             label    : 'Filename',
             cell     : FilenameCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'lastWriteTime',
             label    : 'Last Write Time',
             cell     : RelativeDateCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'downloadUrl',
             label    : '',
             cell     : DownloadLogCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function(options) {
         this.collection = options.collection;
         this.deleteFilesCommand = options.deleteFilesCommand;
+
         this.listenTo(vent, vent.Commands.ShowLogFile, this._fetchLogFileContents);
         this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
         this.listenTo(this.collection, 'sync', this._collectionSynced);
+
         this.collection.fetch();
     },
+
     onShow : function() {
         this._showToolbar();
         this._showTable();
     },
+
     _showToolbar : function() {
         var leftSideButtons = {
             type       : 'default',
             storeState : false,
-            items      : [{
+            items      : [
+                {
                     title        : 'Refresh',
                     icon         : 'icon-refresh',
                     ownerContext : this,
                     callback     : this._refreshTable
-            }, {
+                },
+                {
                     title          : 'Delete Log Files',
                     icon           : 'icon-trash',
                     command        : this.deleteFilesCommand,
                     successMessage : 'Log files have been deleted',
                     errorMessage   : 'Failed to delete log files'
-            }]
+                }
+            ]
         };
+
         this.toolbar.show(new ToolbarLayout({
             left    : [leftSideButtons],
             context : this
         }));
     },
+
     _showTable : function() {
         this.grid.show(new Backgrid.Grid({
             row        : LogFileRow,
@@ -76,30 +92,41 @@ module.exports = Marionette.Layout.extend({
             className  : 'table table-hover'
         }));
     },
+
     _collectionSynced : function() {
         if (!this.collection.any()) {
             return;
         }
+
         var model = this.collection.first();
         this._fetchLogFileContents({ model : model });
     },
+
     _fetchLogFileContents : function(options) {
         this.contents.show(new LoadingView());
+
         var model = options.model;
         var contentsModel = new ContentsModel(model.toJSON());
+
         this.listenToOnce(contentsModel, 'sync', this._showDetails);
+
         contentsModel.fetch({ dataType : 'text' });
     },
+
     _showDetails : function(model) {
         this.contents.show(new ContentsView({ model : model }));
     },
+
     _refreshTable : function(buttonContext) {
         this.contents.close();
         var promise = this.collection.fetch();
+
+        //Would be nice to spin the icon on the refresh button
         if (buttonContext) {
             buttonContext.ui.icon.spinForPromise(promise);
         }
     },
+
     _commandComplete : function(options) {
         if (options.command.get('name') === this.deleteFilesCommand.toLowerCase()) {
             this._refreshTable();

src/UI/System/Logs/Files/Row.js

@@ -3,7 +3,11 @@ var Backgrid = require('backgrid');
 
 module.exports = Backgrid.Row.extend({
     className : 'log-file-row',
-    events       : {"click" : '_showDetails'},
+
+    events : {
+        'click' : '_showDetails'
+    },
+
     _showDetails : function() {
         vent.trigger(vent.Commands.ShowLogFile, { model : this.model });
     }

src/UI/System/Logs/LogsCollection.js

@@ -3,16 +3,17 @@ var LogsModel = require('./LogsModel');
 var AsFilteredCollection = require('../../Mixins/AsFilteredCollection');
 var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
 
-module.exports = (function(){
 var collection = PagableCollection.extend({
     url       : window.NzbDrone.ApiRoot + '/log',
     model     : LogsModel,
     tableName : 'logs',
+
     state : {
         pageSize : 50,
         sortKey  : 'time',
         order    : 1
     },
+
     queryParams : {
         totalPages   : null,
         totalRecords : null,
@@ -20,26 +21,44 @@ module.exports = (function(){
         sortKey      : 'sortKey',
         order        : 'sortDir',
         directions   : {
-                "-1" : 'asc',
+            '-1' : 'asc',
-                "1"  : 'desc'
+            '1'  : 'desc'
         }
     },
+
+    // Filter Modes
     filterModes : {
-            "all"   : [null, null],
+        "all"   : [
-            "info"  : ['level', 'Info'],
+            null,
-            "warn"  : ['level', 'Warn'],
+            null
-            "error" : ['level', 'Error']
+        ],
+        "info"  : [
+            'level',
+            'Info'
+        ],
+        "warn"  : [
+            'level',
+            'Warn'
+        ],
+        "error" : [
+            'level',
+            'Error'
+        ]
     },
+
     parseState : function(resp, queryParams, state) {
         return { totalRecords : resp.totalRecords };
     },
+
     parseRecords : function(resp) {
         if (resp) {
             return resp.records;
         }
+
         return resp;
     }
 });
+
 collection = AsFilteredCollection.apply(collection);
-    return AsPersistedStateCollection.apply(collection);
+
-}).call(this);
+module.exports = AsPersistedStateCollection.apply(collection);

src/UI/System/Logs/LogsLayout.js

@@ -6,45 +6,55 @@ var UpdateLogFileCollection = require('./Updates/LogFileCollection');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Logs/LogsLayoutTemplate',
+
     ui : {
         tableTab       : '.x-table-tab',
         filesTab       : '.x-files-tab',
         updateFilesTab : '.x-update-files-tab'
     },
+
     regions : {
         table       : '#table',
         files       : '#files',
         updateFiles : '#update-files'
     },
+
     events : {
-        "click .x-table-tab"        : '_showTable',
+        'click .x-table-tab'        : '_showTable',
-        "click .x-files-tab"        : '_showFiles',
+        'click .x-files-tab'        : '_showFiles',
-        "click .x-update-files-tab" : '_showUpdateFiles'
+        'click .x-update-files-tab' : '_showUpdateFiles'
     },
+
     onShow : function() {
         this._showTable();
     },
+
     _showTable : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.tableTab.tab('show');
         this.table.show(new LogsTableLayout());
     },
+
     _showFiles : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.filesTab.tab('show');
         this.files.show(new LogsFileLayout({
             collection         : new LogFileCollection(),
             deleteFilesCommand : 'deleteLogFiles'
         }));
     },
+
     _showUpdateFiles : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.ui.updateFilesTab.tab('show');
         this.updateFiles.show(new LogsFileLayout({
             collection         : new UpdateLogFileCollection(),

src/UI/System/Logs/Table/Details/LogDetailsView.js

@@ -1,4 +1,6 @@
 var vent = require('vent');
 var Marionette = require('marionette');
 
-module.exports = Marionette.ItemView.extend({template : 'System/Logs/Table/Details/LogDetailsViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'System/Logs/Table/Details/LogDetailsViewTemplate'
+});

src/UI/System/Logs/Table/LogLevelCell.js

@@ -2,9 +2,11 @@ var NzbDroneCell = require('../../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'log-level-cell',
+
     render : function() {
         var level = this._getValue();
         this.$el.html('<i class="icon-{0}" title="{1}"/>'.format(this._getValue().toLowerCase(), level));
+
         return this;
     }
 });

src/UI/System/Logs/Table/LogRow.js

@@ -3,7 +3,11 @@ var Backgrid = require('backgrid');
 
 module.exports = Backgrid.Row.extend({
     className : 'log-row',
-    events       : {"click" : '_showDetails'},
+
+    events : {
+        'click' : '_showDetails'
+    },
+
     _showDetails : function() {
         vent.trigger(vent.Commands.ShowLogDetails, { model : this.model });
     }

src/UI/System/Logs/Table/LogTimeCell.js

@@ -4,9 +4,11 @@ var UiSettings = require('../../../Shared/UiSettingsModel');
 
 module.exports = NzbDroneCell.extend({
     className : 'log-time-cell',
+
     render : function() {
         var date = moment(this._getValue());
         this.$el.html('<span title="{1}">{0}</span>'.format(date.format(UiSettings.time(true, false)), date.format(UiSettings.longDateTime(true))));
+
         return this;
     }
 });

src/UI/System/Logs/Table/LogsTableLayout.js

@@ -12,43 +12,62 @@ require('../../../jQuery/jquery.spin');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Logs/Table/LogsTableLayoutTemplate',
+
     regions : {
         grid    : '#x-grid',
         toolbar : '#x-toolbar',
         pager   : '#x-pager'
     },
-    attributes       : {id : 'logs-screen'},
+
-    columns          : [{
+    attributes : {
+        id : 'logs-screen'
+    },
+
+    columns : [
+        {
             name     : 'level',
             label    : '',
             sortable : true,
             cell     : LogLevelCell
-    }, {
+        },
+        {
             name     : 'logger',
             label    : 'Component',
             sortable : true,
-        cell     : Backgrid.StringCell.extend({className : 'log-logger-cell'})
+            cell     : Backgrid.StringCell.extend({
-    }, {
+                className : 'log-logger-cell'
+            })
+        },
+        {
             name     : 'message',
             label    : 'Message',
             sortable : false,
-        cell     : Backgrid.StringCell.extend({className : 'log-message-cell'})
+            cell     : Backgrid.StringCell.extend({
-    }, {
+                className : 'log-message-cell'
+            })
+        },
+        {
             name  : 'time',
             label : 'Time',
             cell  : LogTimeCell
-    }],
+        }
+    ],
+
     initialize : function() {
         this.collection = new LogCollection();
+
         this.listenTo(this.collection, 'sync', this._showTable);
         this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
     },
+
     onRender : function() {
         this.grid.show(new LoadingView());
     },
+
     onShow : function() {
         this._showToolbar();
     },
+
     _showTable : function() {
         this.grid.show(new Backgrid.Grid({
             row        : LogRow,
@@ -56,79 +75,98 @@ module.exports = Marionette.Layout.extend({
             collection : this.collection,
             className  : 'table table-hover'
         }));
+
         this.pager.show(new GridPager({
             columns    : this.columns,
             collection : this.collection
         }));
     },
+
     _showToolbar : function() {
         var filterButtons = {
             type          : 'radio',
             storeState    : true,
             menuKey       : 'logs.filterMode',
             defaultAction : 'all',
-            items         : [{
+            items         : [
+                {
                     key      : 'all',
                     title    : '',
                     tooltip  : 'All',
                     icon     : 'icon-circle-blank',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'info',
                     title    : '',
                     tooltip  : 'Info',
                     icon     : 'icon-info',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'warn',
                     title    : '',
                     tooltip  : 'Warn',
                     icon     : 'icon-warn',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'error',
                     title    : '',
                     tooltip  : 'Error',
                     icon     : 'icon-error',
                     callback : this._setFilter
-            }]
+                }
+            ]
         };
+
         var leftSideButtons = {
             type       : 'default',
             storeState : false,
-            items      : [{
+            items      : [
+                {
                     title        : 'Refresh',
                     icon         : 'icon-refresh',
                     ownerContext : this,
                     callback     : this._refreshTable
-            }, {
+                },
+                {
                     title   : 'Clear Logs',
                     icon    : 'icon-trash',
                     command : 'clearLog'
-            }]
+                }
+            ]
         };
+
         this.toolbar.show(new ToolbarLayout({
             left    : [leftSideButtons],
             right   : [filterButtons],
             context : this
         }));
     },
+
     _refreshTable : function(buttonContext) {
         this.collection.state.currentPage = 1;
         var promise = this.collection.fetch({ reset : true });
+
         if (buttonContext) {
             buttonContext.ui.icon.spinForPromise(promise);
         }
     },
+
     _setFilter : function(buttonContext) {
         var mode = buttonContext.model.get('key');
+
         this.collection.setFilterMode(mode, { reset : false });
+
         this.collection.state.currentPage = 1;
         var promise = this.collection.fetch({ reset : true });
+
         if (buttonContext) {
             buttonContext.ui.icon.spinForPromise(promise);
         }
     },
+
     _commandComplete : function(options) {
         if (options.command.get('name') === 'clearlog') {
             this._refreshTable();

src/UI/System/Logs/Updates/LogFileCollection.js

@@ -4,6 +4,7 @@ var LogFileModel = require('./LogFileModel');
 module.exports = Backbone.Collection.extend({
     url   : window.NzbDrone.ApiRoot + '/log/file/update',
     model : LogFileModel,
+
     state : {
         sortKey : 'lastWriteTime',
         order   : 1

src/UI/System/StatusModel.js

@@ -1,8 +1,9 @@
 var Backbone = require('backbone');
 var ApiData = require('../Shared/ApiData');
 
-module.exports = (function(){
+var StatusModel = Backbone.Model.extend({
-    var StatusModel = Backbone.Model.extend({url : window.NzbDrone.ApiRoot + '/system/status'});
+    url : window.NzbDrone.ApiRoot + '/system/status'
+});
 var instance = new StatusModel(ApiData.get('system/status'));
-    return instance;
+
-}).call(this);
+module.exports = instance;

src/UI/System/SystemLayout.js

@@ -1,4 +1,4 @@
-var $ = require('jquery');
+var $ = require('jquery');
 var Backbone = require('backbone');
 var Marionette = require('marionette');
 var SystemInfoLayout = require('./Info/SystemInfoLayout');
@@ -11,6 +11,7 @@ var StatusModel = require('./StatusModel');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/SystemLayoutTemplate',
+
     regions : {
         status  : '#status',
         logs    : '#logs',
@@ -18,6 +19,7 @@ module.exports = Marionette.Layout.extend({
         backup  : '#backup',
         tasks   : '#tasks'
     },
+
     ui : {
         statusTab  : '.x-status-tab',
         logsTab    : '.x-logs-tab',
@@ -25,6 +27,7 @@ module.exports = Marionette.Layout.extend({
         backupTab  : '.x-backup-tab',
         tasksTab   : '.x-tasks-tab'
     },
+
     events : {
         'click .x-status-tab'  : '_showStatus',
         'click .x-logs-tab'    : '_showLogs',
@@ -34,6 +37,7 @@ module.exports = Marionette.Layout.extend({
         'click .x-shutdown'    : '_shutdown',
         'click .x-restart'     : '_restart'
     },
+
     initialize : function(options) {
         if (options.action) {
             this.action = options.action.toLowerCase();
@@ -43,6 +47,7 @@ module.exports = Marionette.Layout.extend({
             authentication : StatusModel.get('authentication')
         };
     },
+
     onShow : function() {
         switch (this.action) {
             case 'logs':
@@ -61,12 +66,14 @@ module.exports = Marionette.Layout.extend({
                 this._showStatus();
         }
     },
+
     _navigate : function(route) {
         Backbone.history.navigate(route, {
             trigger : true,
             replace : true
         });
     },
+
     _showStatus : function(e) {
         if (e) {
             e.preventDefault();
@@ -76,53 +83,65 @@ module.exports = Marionette.Layout.extend({
         this.ui.statusTab.tab('show');
         this._navigate('system/status');
     },
+
     _showLogs : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.logs.show(new LogsLayout());
         this.ui.logsTab.tab('show');
         this._navigate('system/logs');
     },
+
     _showUpdates : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.updates.show(new UpdateLayout());
         this.ui.updatesTab.tab('show');
         this._navigate('system/updates');
     },
+
     _showBackup : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.backup.show(new BackupLayout());
         this.ui.backupTab.tab('show');
         this._navigate('system/backup');
     },
+
     _showTasks : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.tasks.show(new TaskLayout());
         this.ui.tasksTab.tab('show');
         this._navigate('system/tasks');
     },
+
     _shutdown : function() {
         $.ajax({
             url  : window.NzbDrone.ApiRoot + '/system/shutdown',
             type : 'POST'
         });
+
         Messenger.show({
             message : 'Sonarr will shutdown shortly',
             type    : 'info'
         });
     },
+
     _restart : function() {
         $.ajax({
             url  : window.NzbDrone.ApiRoot + '/system/restart',
             type : 'POST'
         });
+
         Messenger.show({
             message : 'Sonarr will restart shortly',
             type    : 'info'

src/UI/System/SystemLayoutTemplate.hbs

@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="#status" class="x-status-tab no-router">Status</a></li>
     <li><a href="#updates" class="x-updates-tab no-router">Updates</a></li>
     <li><a href="#tasks" class="x-tasks-tab no-router">Tasks</a></li>

src/UI/System/Task/ExecuteTaskCell.js

@@ -3,18 +3,27 @@ var CommandController = require('../../Commands/CommandController');
 
 module.exports = NzbDroneCell.extend({
     className : 'execute-task-cell',
-    events       : {"click .x-execute" : '_executeTask'},
+
+    events : {
+        'click .x-execute' : '_executeTask'
+    },
+
     render : function() {
         this.$el.empty();
+
         var name = this.model.get('name');
         var task = this.model.get('taskName');
+
         this.$el.html('<i class="icon-refresh icon-can-spin x-execute" title="Execute {0}"></i>'.format(name));
+
         CommandController.bindToCommand({
             element : this.$el.find('.x-execute'),
             command : { name : task }
         });
+
         return this;
     },
+
     _executeTask : function() {
         CommandController.Execute(this.model.get('taskName'), { name : this.model.get('taskName') });
     }

src/UI/System/Task/NextExecutionCell.js

@@ -4,28 +4,31 @@ var UiSettings = require('../../Shared/UiSettingsModel');
 
 module.exports = NzbDroneCell.extend({
     className : 'next-execution-cell',
+
     render : function() {
         this.$el.empty();
+
         var interval = this.model.get('interval');
         var nextExecution = moment(this.model.get('nextExecution'));
+
         if (interval === 0) {
             this.$el.html('-');
-        }
+        } else if (moment().isAfter(nextExecution)) {
-        else if(moment().isAfter(nextExecution)) {
             this.$el.html('now');
-        }
+        } else {
-        else {
             var result = '<span title="{0}">{1}</span>';
             var tooltip = nextExecution.format(UiSettings.longDateTime());
             var text;
+
             if (UiSettings.get('showRelativeDates')) {
                 text = nextExecution.fromNow();
-            }
+            } else {
-            else {
                 text = nextExecution.format(UiSettings.shortDateTime());
             }
+
             this.$el.html(result.format(tooltip, text));
         }
+
         return this;
     }
 });

src/UI/System/Task/TaskCollection.js

@@ -4,10 +4,12 @@ var TaskModel = require('./TaskModel');
 module.exports = PageableCollection.extend({
     url   : window.NzbDrone.ApiRoot + '/system/task',
     model : TaskModel,
+
     state : {
         sortKey  : 'name',
         order    : -1,
         pageSize : 100000
     },
+
     mode : 'client'
 });

src/UI/System/Task/TaskIntervalCell.js

@@ -3,16 +3,19 @@ var moment = require('moment');
 
 module.exports = NzbDroneCell.extend({
     className : 'task-interval-cell',
+
     render : function() {
         this.$el.empty();
+
         var interval = this.model.get('interval');
         var duration = moment.duration(interval, 'minutes').humanize().replace(/an?(?=\s)/, '1');
+
         if (interval === 0) {
             this.$el.html('disabled');
-        }
+        } else {
-        else {
             this.$el.html(duration);
         }
+
         return this;
     }
 });

src/UI/System/Task/TaskLayout.js

@@ -10,42 +10,57 @@ require('../../Mixins/backbone.signalr.mixin');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Task/TaskLayoutTemplate',
-    regions    : {tasks : '#x-tasks'},
+
-    columns    : [{
+    regions : {
+        tasks : '#x-tasks'
+    },
+
+    columns : [
+        {
             name     : 'name',
             label    : 'Name',
             sortable : true,
             cell     : 'string'
-    }, {
+        },
+        {
             name     : 'interval',
             label    : 'Interval',
             sortable : true,
             cell     : TaskIntervalCell
-    }, {
+        },
+        {
             name     : 'lastExecution',
             label    : 'Last Execution',
             sortable : true,
             cell     : RelativeTimeCell
-    }, {
+        },
+        {
             name     : 'nextExecution',
             label    : 'Next Execution',
             sortable : true,
             cell     : NextExecutionCell
-    }, {
+        },
+        {
             name     : 'this',
             label    : '',
             sortable : false,
             cell     : ExecuteTaskCell
-    }],
+        }
+    ],
+
     initialize : function() {
         this.taskCollection = new BackupCollection();
+
         this.listenTo(this.taskCollection, 'sync', this._showTasks);
         this.taskCollection.bindSignalR();
     },
+
     onRender : function() {
         this.tasks.show(new LoadingView());
+
         this.taskCollection.fetch();
     },
+
     _showTasks : function() {
         this.tasks.show(new Backgrid.Grid({
             columns    : this.columns,

src/UI/System/Update/EmptyView.js

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

src/UI/System/Update/UpdateItemView.js

@@ -3,17 +3,25 @@ var CommandController = require('../../Commands/CommandController');
 
 module.exports = Marionette.ItemView.extend({
     template : 'System/Update/UpdateItemViewTemplate',
-    events         : {"click .x-install-update" : '_installUpdate'},
+
+    events : {
+        'click .x-install-update' : '_installUpdate'
+    },
+
     initialize : function() {
         this.updating = false;
     },
+
     _installUpdate : function() {
         if (this.updating) {
             return;
         }
+
         this.updating = true;
         var self = this;
+
         var promise = CommandController.Execute('applicationUpdate');
+
         promise.done(function() {
             window.setTimeout(function() {
                 self.updating = false;

src/UI/System/Update/UpdateLayout.js

@@ -6,15 +6,23 @@ var LoadingView = require('../../Shared/LoadingView');
 
 module.exports = Marionette.Layout.extend({
     template : 'System/Update/UpdateLayoutTemplate',
-    regions      : {updates : '#x-updates'},
+
+    regions : {
+        updates : '#x-updates'
+    },
+
     initialize : function() {
         this.updateCollection = new UpdateCollection();
+
         this.listenTo(this.updateCollection, 'sync', this._showUpdates);
     },
+
     onRender : function() {
         this.updates.show(new LoadingView());
+
         this.updateCollection.fetch();
     },
+
     _showUpdates : function() {
         this.updates.show(new UpdateCollectionView({ collection : this.updateCollection }));
     }

src/UI/Tags/TagCollection.js

@@ -2,9 +2,7 @@
 var TagModel = require('./TagModel');
 var ApiData = require('../Shared/ApiData');
 
-require('../Mixins/backbone.signalr.mixin');
+var Collection = Backbone.Collection.extend({
-
-var collection = Backbone.Collection.extend({
     url   : window.NzbDrone.ApiRoot + '/tag',
     model : TagModel,
 
@@ -13,4 +11,4 @@ var collection = Backbone.Collection.extend({
     }
 });
 
-module.exports = new collection(ApiData.get('tag')).bindSignalR();
+module.exports = new Collection(ApiData.get('tag'));

src/UI/Tags/TagHelpers.js

@@ -2,22 +2,24 @@ var _ = require('underscore');
 var Handlebars = require('handlebars');
 var TagCollection = require('./TagCollection');
 
-module.exports = (function(){
 Handlebars.registerHelper('tagDisplay', function(tags) {
     var tagLabels = _.map(TagCollection.filter(function(tag) {
         return _.contains(tags, tag.get('id'));
     }), function(tag) {
         return '<span class="label label-info">{0}</span>'.format(tag.get('label'));
     });
+
     return new Handlebars.SafeString(tagLabels.join(' '));
 });
+
 Handlebars.registerHelper('genericTagDisplay', function(tags, classes) {
     if (!tags) {
         return new Handlebars.SafeString('');
     }
+
     var tagLabels = _.map(tags.split(','), function(tag) {
         return '<span class="{0}">{1}</span>'.format(classes, tag);
     });
+
     return new Handlebars.SafeString(tagLabels.join(' '));
 });
-}).call(this);

src/UI/Wanted/Cutoff/CutoffUnmetCollection.js

@@ -5,16 +5,17 @@ var AsFilteredCollection = require('../../Mixins/AsFilteredCollection');
 var AsSortedCollection = require('../../Mixins/AsSortedCollection');
 var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
 
-module.exports = (function(){
 var Collection = PagableCollection.extend({
     url       : window.NzbDrone.ApiRoot + '/wanted/cutoff',
     model     : EpisodeModel,
     tableName : 'wanted.cutoff',
+
     state : {
         pageSize : 15,
         sortKey  : 'airDateUtc',
         order    : 1
     },
+
     queryParams : {
         totalPages   : null,
         totalRecords : null,
@@ -22,26 +23,41 @@ module.exports = (function(){
         sortKey      : 'sortKey',
         order        : 'sortDir',
         directions   : {
-                "-1" : 'asc',
+            '-1' : 'asc',
-                "1"  : 'desc'
+            '1'  : 'desc'
         }
     },
+
+    // Filter Modes
     filterModes : {
-            "monitored"   : ['monitored', 'true'],
+        'monitored'   : [
-            "unmonitored" : ['monitored', 'false']
+            'monitored',
+            'true'
+        ],
+        'unmonitored' : [
+            'monitored',
+            'false'
+        ],
+    },
+
+    sortMappings : {
+        'series' : { sortKey : 'series.sortTitle' }
     },
-        sortMappings : {"series" : {sortKey : 'series.sortTitle'}},
+
     parseState : function(resp) {
         return { totalRecords : resp.totalRecords };
     },
+
     parseRecords : function(resp) {
         if (resp) {
             return resp.records;
         }
+
         return resp;
     }
 });
+
 Collection = AsFilteredCollection.call(Collection);
 Collection = AsSortedCollection.call(Collection);
-    return AsPersistedStateCollection.call(Collection);
+
-}).call(this);
+module.exports = AsPersistedStateCollection.call(Collection);

src/UI/Wanted/Cutoff/CutoffUnmetLayout.js

@@ -17,126 +17,168 @@ require('../../Mixins/backbone.signalr.mixin');
 
 module.exports = Marionette.Layout.extend({
     template : 'Wanted/Cutoff/CutoffUnmetLayoutTemplate',
+
     regions : {
         cutoff  : '#x-cutoff-unmet',
         toolbar : '#x-toolbar',
         pager   : '#x-pager'
     },
-    ui              : {searchSelectedButton : '.btn i.icon-search'},
+
-    columns         : [{
+    ui : {
+        searchSelectedButton : '.btn i.icon-search'
+    },
+
+    columns : [
+        {
             name       : '',
             cell       : 'select-row',
             headerCell : 'select-all',
             sortable   : false
-    }, {
+        },
+        {
             name      : 'series',
             label     : 'Series Title',
             cell      : SeriesTitleCell,
             sortValue : 'series.sortTitle'
-    }, {
+        },
+        {
             name     : 'this',
             label    : 'Episode',
             cell     : EpisodeNumberCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'this',
             label    : 'Episode Title',
             cell     : EpisodeTitleCell,
             sortable : false
-    }, {
+        },
+        {
             name  : 'airDateUtc',
             label : 'Air Date',
             cell  : RelativeDateCell
-    }, {
+        },
+        {
             name     : 'status',
             label    : 'Status',
             cell     : EpisodeStatusCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function() {
         this.collection = new CutoffUnmetCollection().bindSignalR({ updateOnly : true });
+
         this.listenTo(this.collection, 'sync', this._showTable);
     },
+
     onShow : function() {
         this.cutoff.show(new LoadingView());
         this._showToolbar();
         this.collection.fetch();
     },
+
     _showTable : function() {
         this.cutoffGrid = new Backgrid.Grid({
             columns    : this.columns,
             collection : this.collection,
             className  : 'table table-hover'
         });
+
         this.cutoff.show(this.cutoffGrid);
+
         this.pager.show(new GridPager({
             columns    : this.columns,
             collection : this.collection
         }));
     },
+
     _showToolbar : function() {
         var leftSideButtons = {
             type       : 'default',
             storeState : false,
-            items      : [{
+            items      : [
+                {
                     title        : 'Search Selected',
                     icon         : 'icon-search',
                     callback     : this._searchSelected,
                     ownerContext : this,
                     className    : 'x-search-selected'
-            }, {
+                },
+                {
                     title : 'Season Pass',
                     icon  : 'icon-bookmark',
                     route : 'seasonpass'
-            }]
+                }
+            ]
         };
+
         var filterOptions = {
             type          : 'radio',
             storeState    : false,
             menuKey       : 'wanted.filterMode',
             defaultAction : 'monitored',
-            items         : [{
+            items         : [
+                {
                     key      : 'monitored',
                     title    : '',
                     tooltip  : 'Monitored Only',
                     icon     : 'icon-nd-monitored',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'unmonitored',
                     title    : '',
                     tooltip  : 'Unmonitored Only',
                     icon     : 'icon-nd-unmonitored',
                     callback : this._setFilter
-            }]
+                }
+            ]
         };
+
         this.toolbar.show(new ToolbarLayout({
-            left    : [leftSideButtons],
+            left    : [
-            right   : [filterOptions],
+                leftSideButtons
+            ],
+            right   : [
+                filterOptions
+            ],
             context : this
         }));
+
         CommandController.bindToCommand({
             element : this.$('.x-search-selected'),
-            command : {name : 'episodeSearch'}
+            command : {
+                name : 'episodeSearch'
+            }
         });
     },
+
     _setFilter : function(buttonContext) {
         var mode = buttonContext.model.get('key');
+
         this.collection.state.currentPage = 1;
         var promise = this.collection.setFilterMode(mode);
+
         if (buttonContext) {
             buttonContext.ui.icon.spinForPromise(promise);
         }
     },
+
     _searchSelected : function() {
         var selected = this.cutoffGrid.getSelectedModels();
+
         if (selected.length === 0) {
             Messenger.show({
                 type    : 'error',
                 message : 'No episodes selected'
             });
+
             return;
         }
+
         var ids = _.pluck(selected, 'id');
+
         CommandController.Execute('episodeSearch', {
             name       : 'episodeSearch',
             episodeIds : ids

src/UI/Wanted/Missing/MissingCollection.js

@@ -5,16 +5,17 @@ var AsFilteredCollection = require('../../Mixins/AsFilteredCollection');
 var AsSortedCollection = require('../../Mixins/AsSortedCollection');
 var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
 
-module.exports = (function(){
 var Collection = PagableCollection.extend({
     url       : window.NzbDrone.ApiRoot + '/wanted/missing',
     model     : EpisodeModel,
     tableName : 'wanted.missing',
+
     state : {
         pageSize : 15,
         sortKey  : 'airDateUtc',
         order    : 1
     },
+
     queryParams : {
         totalPages   : null,
         totalRecords : null,
@@ -22,26 +23,39 @@ module.exports = (function(){
         sortKey      : 'sortKey',
         order        : 'sortDir',
         directions   : {
-                "-1" : 'asc',
+            '-1' : 'asc',
-                "1"  : 'desc'
+            '1'  : 'desc'
         }
     },
+
     filterModes : {
-            "monitored"   : ['monitored', 'true'],
+        'monitored'   : [
-            "unmonitored" : ['monitored', 'false']
+            'monitored',
+            'true'
+        ],
+        'unmonitored' : [
+            'monitored',
+            'false'
+        ]
+    },
+
+    sortMappings : {
+        'series' : { sortKey : 'series.sortTitle' }
     },
-        sortMappings : {"series" : {sortKey : 'series.sortTitle'}},
+
     parseState : function(resp) {
         return { totalRecords : resp.totalRecords };
     },
+
     parseRecords : function(resp) {
         if (resp) {
             return resp.records;
         }
+
         return resp;
     }
 });
 Collection = AsFilteredCollection.call(Collection);
 Collection = AsSortedCollection.call(Collection);
-    return AsPersistedStateCollection.call(Collection);
+
-}).call(this);
+module.exports = AsPersistedStateCollection.call(Collection);

src/UI/Wanted/Missing/MissingLayout.js

@@ -17,109 +17,137 @@ require('../../Mixins/backbone.signalr.mixin');
 
 module.exports = Marionette.Layout.extend({
     template : 'Wanted/Missing/MissingLayoutTemplate',
+
     regions : {
         missing : '#x-missing',
         toolbar : '#x-toolbar',
         pager   : '#x-pager'
     },
-    ui              : {searchSelectedButton : '.btn i.icon-search'},
+
-    columns         : [{
+    ui : {
+        searchSelectedButton : '.btn i.icon-search'
+    },
+
+    columns : [
+        {
             name       : '',
             cell       : 'select-row',
             headerCell : 'select-all',
             sortable   : false
-    }, {
+        },
+        {
             name      : 'series',
             label     : 'Series Title',
             cell      : SeriesTitleCell,
             sortValue : 'series.sortTitle'
-    }, {
+        },
+        {
             name     : 'this',
             label    : 'Episode',
             cell     : EpisodeNumberCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'this',
             label    : 'Episode Title',
             cell     : EpisodeTitleCell,
             sortable : false
-    }, {
+        },
+        {
             name  : 'airDateUtc',
             label : 'Air Date',
             cell  : RelativeDateCell
-    }, {
+        },
+        {
             name     : 'status',
             label    : 'Status',
             cell     : EpisodeStatusCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function() {
         this.collection = new MissingCollection().bindSignalR({ updateOnly : true });
+
         this.listenTo(this.collection, 'sync', this._showTable);
     },
+
     onShow : function() {
         this.missing.show(new LoadingView());
         this._showToolbar();
         this.collection.fetch();
     },
+
     _showTable : function() {
         this.missingGrid = new Backgrid.Grid({
             columns    : this.columns,
             collection : this.collection,
             className  : 'table table-hover'
         });
+
         this.missing.show(this.missingGrid);
+
         this.pager.show(new GridPager({
             columns    : this.columns,
             collection : this.collection
         }));
     },
+
     _showToolbar    : function() {
         var leftSideButtons = {
             type       : 'default',
             storeState : false,
             collapse   : true,
-            items      : [{
+            items      : [
+                {
                     title        : 'Search Selected',
                     icon         : 'icon-search',
                     callback     : this._searchSelected,
                     ownerContext : this,
                     className    : 'x-search-selected'
-            }, {
+                },
+                {
                     title        : 'Search All Missing',
                     icon         : 'icon-search',
                     callback     : this._searchMissing,
                     ownerContext : this,
                     className    : 'x-search-missing'
-            }, {
+                },
+                {
                     title : 'Season Pass',
                     icon  : 'icon-bookmark',
                     route : 'seasonpass'
-            }, {
+                },
+                {
                     title   : 'Rescan Drone Factory Folder',
                     icon    : 'icon-refresh',
                     command : 'downloadedepisodesscan',
+
                     properties : { sendUpdates : true }
-            }]
+                }
+            ]
         };
         var filterOptions = {
             type          : 'radio',
             storeState    : false,
             menuKey       : 'wanted.filterMode',
             defaultAction : 'monitored',
-            items         : [{
+            items         : [
+                {
                     key      : 'monitored',
                     title    : '',
                     tooltip  : 'Monitored Only',
                     icon     : 'icon-nd-monitored',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'unmonitored',
                     title    : '',
                     tooltip  : 'Unmonitored Only',
                     icon     : 'icon-nd-unmonitored',
                     callback : this._setFilter
-            }]
+                }
+            ]
         };
         this.toolbar.show(new ToolbarLayout({
             left    : [leftSideButtons],
@@ -159,7 +187,8 @@ module.exports = Marionette.Layout.extend({
         });
     },
     _searchMissing  : function() {
-        if(window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) + 'One API request to each indexer will be used for each episode. ' + 'This cannot be stopped once started.')) {
+        if (window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) +
+                           'One API request to each indexer will be used for each episode. ' + 'This cannot be stopped once started.')) {
             CommandController.Execute('missingEpisodeSearch', { name : 'missingEpisodeSearch' });
         }
     }

src/UI/Wanted/WantedLayout.js

@@ -6,20 +6,29 @@ var CutoffUnmetLayout = require('./Cutoff/CutoffUnmetLayout');
 
 module.exports = Marionette.Layout.extend({
     template : 'Wanted/WantedLayoutTemplate',
-    regions          : {content : '#content'},
+
+    regions : {
+        content : '#content'
+        //missing    : '#missing',
+        //cutoff     : '#cutoff'
+    },
+
     ui : {
         missingTab : '.x-missing-tab',
         cutoffTab  : '.x-cutoff-tab'
     },
+
     events : {
-        "click .x-missing-tab" : '_showMissing',
+        'click .x-missing-tab' : '_showMissing',
-        "click .x-cutoff-tab"  : '_showCutoffUnmet'
+        'click .x-cutoff-tab'  : '_showCutoffUnmet'
     },
+
     initialize : function(options) {
         if (options.action) {
             this.action = options.action.toLowerCase();
         }
     },
+
     onShow : function() {
         switch (this.action) {
             case 'cutoff':
@@ -29,24 +38,29 @@ module.exports = Marionette.Layout.extend({
                 this._showMissing();
         }
     },
+
     _navigate : function(route) {
         Backbone.history.navigate(route, {
             trigger : false,
             replace : true
         });
     },
+
     _showMissing : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.content.show(new MissingLayout());
         this.ui.missingTab.tab('show');
         this._navigate('/wanted/missing');
     },
+
     _showCutoffUnmet : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.content.show(new CutoffUnmetLayout());
         this.ui.cutoffTab.tab('show');
         this._navigate('/wanted/cutoff');