UI Cleanup - Updated Activity subtree.

src/UI/.idea/codeStyleSettings.xml

@@ -21,6 +21,7 @@
           <option name="ALIGN_OBJECT_PROPERTIES" value="2" />
           <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
           <option name="OBJECT_LITERAL_WRAP" value="2" />
+          <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
         </JSCodeStyleSettings>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@@ -34,15 +35,18 @@
           <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="true" />
           <option name="KEEP_LINE_BREAKS" value="false" />
           <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
           <option name="CATCH_ON_NEW_LINE" value="true" />
           <option name="FINALLY_ON_NEW_LINE" value="true" />
           <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
           <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
-          <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="SPACE_BEFORE_METHOD_LBRACE" value="false" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
           <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="2" />
+          <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+          <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
           <option name="IF_BRACE_FORCE" value="3" />
           <option name="DOWHILE_BRACE_FORCE" value="3" />
           <option name="WHILE_BRACE_FORCE" value="3" />

src/UI/Activity/ActivityLayout.js

@@ -7,26 +7,31 @@ var QueueLayout = require('./Queue/QueueLayout');
 
 module.exports = Marionette.Layout.extend({
     template : 'Activity/ActivityLayoutTemplate',
+
     regions : {
         queueRegion : '#queue',
         history     : '#history',
         blacklist   : '#blacklist'
     },
+
     ui : {
         queueTab     : '.x-queue-tab',
         historyTab   : '.x-history-tab',
         blacklistTab : '.x-blacklist-tab'
     },
+
     events : {
-        "click .x-queue-tab"     : '_showQueue',
+        'click .x-queue-tab'     : '_showQueue',
-        "click .x-history-tab"   : '_showHistory',
+        'click .x-history-tab'   : '_showHistory',
-        "click .x-blacklist-tab" : '_showBlacklist'
+        'click .x-blacklist-tab' : '_showBlacklist'
     },
+
     initialize : function(options) {
         if (options.action) {
             this.action = options.action.toLowerCase();
         }
     },
+
     onShow : function() {
         switch (this.action) {
             case 'history':
@@ -39,32 +44,39 @@ module.exports = Marionette.Layout.extend({
                 this._showQueue();
         }
     },
+
     _navigate : function(route) {
         Backbone.history.navigate(route, {
             trigger : false,
             replace : true
         });
     },
+
     _showHistory : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.history.show(new HistoryLayout());
         this.ui.historyTab.tab('show');
         this._navigate('/activity/history');
     },
+
     _showBlacklist : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.blacklist.show(new BlacklistLayout());
         this.ui.blacklistTab.tab('show');
         this._navigate('/activity/blacklist');
     },
+
     _showQueue : function(e) {
         if (e) {
             e.preventDefault();
         }
+
         this.queueRegion.show(new QueueLayout());
         this.ui.queueTab.tab('show');
         this._navigate('/activity/queue');

src/UI/Activity/Blacklist/BlacklistActionsCell.js

@@ -2,14 +2,18 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'blacklist-controls-cell',
+
     events : {
         'click' : '_delete'
     },
+
     render : function() {
         this.$el.empty();
         this.$el.html('<i class="icon-nd-delete"></i>');
+
         return this;
     },
+
     _delete : function() {
         this.model.destroy();
     }

src/UI/Activity/Blacklist/BlacklistCollection.js

@@ -3,15 +3,16 @@ var PageableCollection = require('backbone.pageable');
 var AsSortedCollection = require('../../Mixins/AsSortedCollection');
 var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
 
-module.exports = (function(){
 var Collection = PageableCollection.extend({
     url   : window.NzbDrone.ApiRoot + '/blacklist',
     model : BlacklistModel,
+
     state : {
         pageSize : 15,
         sortKey  : 'date',
         order    : 1
     },
+
     queryParams : {
         totalPages   : null,
         totalRecords : null,
@@ -23,17 +24,24 @@ module.exports = (function(){
             '1'  : 'desc'
         }
     },
-        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 = AsSortedCollection.call(Collection);
-    return AsPersistedStateCollection.call(Collection);
+Collection = AsPersistedStateCollection.call(Collection);
-}).call(this);
+
+module.exports = Collection;

src/UI/Activity/Blacklist/BlacklistLayout.js

@@ -12,77 +12,100 @@ var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout');
 
 module.exports = Marionette.Layout.extend({
     template : 'Activity/Blacklist/BlacklistLayoutTemplate',
+
     regions : {
         blacklist : '#x-blacklist',
         toolbar   : '#x-toolbar',
         pager     : '#x-pager'
     },
-    columns          : [{
+
+    columns : [
+        {
             name  : 'series',
             label : 'Series',
             cell  : SeriesTitleCell
-    }, {
+        },
+        {
             name  : 'sourceTitle',
             label : 'Source Title',
             cell  : 'string'
-    }, {
+        },
+        {
             name     : 'quality',
             label    : 'Quality',
             cell     : QualityCell,
             sortable : false
-    }, {
+        },
+        {
             name  : 'date',
             label : 'Date',
             cell  : RelativeDateCell
-    }, {
+        },
+        {
             name     : 'this',
             label    : '',
             cell     : BlacklistActionsCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function() {
         this.collection = new BlacklistCollection({ tableName : 'blacklist' });
+
         this.listenTo(this.collection, 'sync', this._showTable);
         this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
     },
+
     onShow : function() {
         this.blacklist.show(new LoadingView());
         this._showToolbar();
         this.collection.fetch();
     },
+
     _showTable : function(collection) {
+
         this.blacklist.show(new Backgrid.Grid({
             columns    : this.columns,
             collection : collection,
             className  : 'table table-hover'
         }));
+
         this.pager.show(new GridPager({
             columns    : this.columns,
             collection : collection
         }));
     },
+
     _showToolbar : function() {
         var leftSideButtons = {
             type       : 'default',
             storeState : false,
-            items      : [{
+            items      : [
+                {
                     title   : 'Clear Blacklist',
                     icon    : 'icon-trash',
                     command : 'clearBlacklist'
-            }]
+                }
+            ]
         };
+
         this.toolbar.show(new ToolbarLayout({
-            left    : [leftSideButtons],
+            left    : [
+                leftSideButtons
+            ],
             context : this
         }));
     },
+
     _refreshTable : function(buttonContext) {
         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') === 'clearblacklist') {
             this._refreshTable();

src/UI/Activity/Blacklist/BlacklistModel.js

@@ -2,11 +2,14 @@ var Backbone = require('backbone');
 var SeriesCollection = require('../../Series/SeriesCollection');
 
 module.exports = Backbone.Model.extend({
+
+    //Hack to deal with Backbone 1.0's bug
     initialize : function() {
         this.url = function() {
             return this.collection.url + '/' + this.get('id');
         };
     },
+
     parse : function(model) {
         model.series = SeriesCollection.get(model.seriesId);
         return model;

src/UI/Activity/History/Details/HistoryDetailsAge.js

@@ -1,13 +1,14 @@
 var Handlebars = require('handlebars');
 
-module.exports = (function(){
 Handlebars.registerHelper('historyAge', function() {
+
     var unit = 'days';
     var age = this.age;
+
     if (age < 2) {
         unit = 'hours';
         age = parseFloat(this.ageHours).toFixed(1);
     }
+
     return new Handlebars.SafeString('<dt>Age (when grabbed):</dt><dd>{0} {1}</dd>'.format(age, unit));
 });
-}).call(this);

src/UI/Activity/History/Details/HistoryDetailsLayout.js

@@ -5,19 +5,31 @@ var HistoryDetailsView = require('./HistoryDetailsView');
 
 module.exports = Marionette.Layout.extend({
     template : 'Activity/History/Details/HistoryDetailsLayoutTemplate',
-    regions       : {bodyRegion : '.modal-body'},
+
-    events        : {"click .x-mark-as-failed" : '_markAsFailed'},
+    regions : {
+        bodyRegion : '.modal-body'
+    },
+
+    events : {
+        'click .x-mark-as-failed' : '_markAsFailed'
+    },
+
     onShow : function() {
         this.bodyRegion.show(new HistoryDetailsView({ model : this.model }));
     },
+
     _markAsFailed : function() {
         var url = window.NzbDrone.ApiRoot + '/history/failed';
-        var data = {id : this.model.get('id')};
+        var data = {
+            id : this.model.get('id')
+        };
+
         $.ajax({
             url  : url,
             type : 'POST',
             data : data
         });
+
         vent.trigger(vent.Commands.CloseModalCommand);
     }
 });

src/UI/Activity/History/Details/HistoryDetailsView.js

@@ -1,4 +1,6 @@
 var Marionette = require('marionette');
 require('./HistoryDetailsAge');
 
-module.exports = Marionette.ItemView.extend({template : 'Activity/History/Details/HistoryDetailsViewTemplate'});
+module.exports = Marionette.ItemView.extend({
+    template : 'Activity/History/Details/HistoryDetailsViewTemplate'
+});

src/UI/Activity/History/HistoryCollection.js

@@ -4,15 +4,16 @@ var AsFilteredCollection = require('../../Mixins/AsFilteredCollection');
 var AsSortedCollection = require('../../Mixins/AsSortedCollection');
 var AsPersistedStateCollection = require('../../Mixins/AsPersistedStateCollection');
 
-module.exports = (function(){
 var Collection = PageableCollection.extend({
     url   : window.NzbDrone.ApiRoot + '/history',
     model : HistoryModel,
+
     state : {
         pageSize : 15,
         sortKey  : 'date',
         order    : 1
     },
+
     queryParams : {
         totalPages   : null,
         totalRecords : null,
@@ -20,37 +21,63 @@ module.exports = (function(){
         sortKey      : 'sortKey',
         order        : 'sortDir',
         directions   : {
-                "-1" : 'asc',
+            '-1' : 'asc',
-                "1"  : 'desc'
+            '1'  : 'desc'
         }
     },
+
     filterModes : {
-            "all"      : [null, null],
+        'all'      : [
-            "grabbed"  : ['eventType', '1'],
+            null,
-            "imported" : ['eventType', '3'],
+            null
-            "failed"   : ['eventType', '4'],
+        ],
-            "deleted"  : ['eventType', '5']
+        'grabbed'  : [
+            'eventType',
+            '1'
+        ],
+        'imported' : [
+            'eventType',
+            '3'
+        ],
+        'failed'   : [
+            'eventType',
+            '4'
+        ],
+        'deleted'  : [
+            'eventType',
+            '5'
+        ]
     },
-        sortMappings : {"series" : {sortKey : 'series.sortTitle'}},
+
+    sortMappings : {
+        'series' : { sortKey : 'series.sortTitle' }
+    },
+
     initialize : function(options) {
         delete this.queryParams.episodeId;
+
         if (options) {
             if (options.episodeId) {
                 this.queryParams.episodeId = options.episodeId;
             }
         }
     },
+
     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);
+Collection = AsPersistedStateCollection.call(Collection);
-}).call(this);
+
+module.exports = Collection;

src/UI/Activity/History/HistoryDetailsCell.js

@@ -3,12 +3,18 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'history-details-cell',
-    events       : {"click" : '_showDetails'},
+
+    events : {
+        'click' : '_showDetails'
+    },
+
     render : function() {
         this.$el.empty();
         this.$el.html('<i class="icon-info-sign"></i>');
+
         return this;
     },
+
     _showDetails : function() {
         vent.trigger(vent.Commands.ShowHistoryDetails, { model : this.model });
     }

src/UI/Activity/History/HistoryLayout.js

@@ -14,111 +14,139 @@ var LoadingView = require('../../Shared/LoadingView');
 
 module.exports = Marionette.Layout.extend({
     template : 'Activity/History/HistoryLayoutTemplate',
+
     regions : {
         history : '#x-history',
         toolbar : '#x-history-toolbar',
         pager   : '#x-history-pager'
     },
-    columns      : [{
+
+    columns : [
+        {
             name      : 'eventType',
             label     : '',
             cell      : EventTypeCell,
             cellValue : 'this'
-    }, {
+        },
+        {
             name  : 'series',
             label : 'Series',
             cell  : SeriesTitleCell
-    }, {
+        },
+        {
             name     : 'episode',
             label    : 'Episode',
             cell     : EpisodeNumberCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'episode',
             label    : 'Episode Title',
             cell     : EpisodeTitleCell,
             sortable : false
-    }, {
+        },
+        {
             name     : 'this',
             label    : 'Quality',
             cell     : HistoryQualityCell,
             sortable : false
-    }, {
+        },
+        {
             name  : 'date',
             label : 'Date',
             cell  : RelativeDateCell
-    }, {
+        },
+        {
             name     : 'this',
             label    : '',
             cell     : HistoryDetailsCell,
             sortable : false
-    }],
+        }
+    ],
+
     initialize : function() {
         this.collection = new HistoryCollection({ tableName : 'history' });
         this.listenTo(this.collection, 'sync', this._showTable);
     },
+
     onShow : function() {
         this.history.show(new LoadingView());
         this._showToolbar();
     },
+
     _showTable : function(collection) {
+
         this.history.show(new Backgrid.Grid({
             columns    : this.columns,
             collection : collection,
             className  : 'table table-hover'
         }));
+
         this.pager.show(new GridPager({
             columns    : this.columns,
             collection : collection
         }));
     },
+
     _showToolbar : function() {
         var filterOptions = {
             type          : 'radio',
             storeState    : true,
             menuKey       : 'history.filterMode',
             defaultAction : 'all',
-            items         : [{
+            items         : [
+                {
                     key      : 'all',
                     title    : '',
                     tooltip  : 'All',
                     icon     : 'icon-circle-blank',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'grabbed',
                     title    : '',
                     tooltip  : 'Grabbed',
                     icon     : 'icon-nd-downloading',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'imported',
                     title    : '',
                     tooltip  : 'Imported',
                     icon     : 'icon-nd-imported',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'failed',
                     title    : '',
                     tooltip  : 'Failed',
                     icon     : 'icon-nd-download-failed',
                     callback : this._setFilter
-            }, {
+                },
+                {
                     key      : 'deleted',
                     title    : '',
                     tooltip  : 'Deleted',
                     icon     : 'icon-nd-deleted',
                     callback : this._setFilter
-            }]
+                }
+            ]
         };
+
         this.toolbar.show(new ToolbarLayout({
-            right   : [filterOptions],
+            right   : [
+                filterOptions
+            ],
             context : this
         }));
     },
+
     _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);
         }

src/UI/Activity/History/HistoryQualityCell.js

@@ -2,23 +2,29 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'history-quality-cell',
+
     render : function() {
+
         var title = '';
         var quality = this.model.get('quality');
         var revision = quality.revision;
+
         if (revision.real && revision.real > 0) {
             title += ' REAL';
         }
+
         if (revision.version && revision.version > 1) {
             title += ' PROPER';
         }
+
         title = title.trim();
+
         if (this.model.get('qualityCutoffNotMet')) {
             this.$el.html('<span class="badge badge-inverse" title="{0}">{1}</span>'.format(title, quality.quality.name));
-        }
+        } else {
-        else {
             this.$el.html('<span class="badge" title="{0}">{1}</span>'.format(title, quality.quality.name));
         }
+
         return this;
     }
 });

src/UI/Activity/Queue/ProgressCell.js

@@ -2,15 +2,22 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 
 module.exports = NzbDroneCell.extend({
     className : 'progress-cell',
+
     render : function() {
         this.$el.empty();
+
         if (this.cellValue) {
+
             var status = this.model.get('status').toLowerCase();
+
             if (status === 'downloading') {
-                var progress = 100 - this.model.get('sizeleft') / this.model.get('size') * 100;
+                var progress = 100 - (this.model.get('sizeleft') / this.model.get('size') * 100);
-                this.$el.html('<div class="progress" title="{0}%">'.format(progress.toFixed(1)) + '<div class="progress-bar progress-bar-purple" style="width: {0}%;"></div></div>'.format(progress));
+
+                this.$el.html('<div class="progress" title="{0}%">'.format(progress.toFixed(1)) +
+                              '<div class="progress-bar progress-bar-purple" style="width: {0}%;"></div></div>'.format(progress));
             }
         }
+
         return this;
     }
 });

src/UI/Activity/Queue/QueueActionsCell.js

@@ -1,14 +1,12 @@
 'use strict';
 
-define(
+var $ = require('jquery');
-    [
+var vent = require('../../vent');
-        'jquery',
+var Marionette = require('marionette');
-        'marionette',
+var TemplatedCell = require('../../Cells/TemplatedCell');
-        'Cells/TemplatedCell',
+var RemoveFromQueueView = require('./RemoveFromQueueView');
-        'Activity/Queue/RemoveFromQueueView',
+
-        'vent'
+module.exports = TemplatedCell.extend({
-    ], function ($, Marionette, TemplatedCell, RemoveFromQueueView, vent) {
-        return TemplatedCell.extend({
 
     template  : 'Activity/Queue/QueueActionsCellTemplate',
     className : 'queue-actions-cell',
@@ -25,10 +23,12 @@ define(
     },
 
     _remove : function() {
-
         var showBlacklist = this.model.get('status') !== 'Pending';
 
-                vent.trigger(vent.Commands.OpenModalCommand, new RemoveFromQueueView({ model: this.model, showBlacklist: showBlacklist }));
+        vent.trigger(vent.Commands.OpenModalCommand, new RemoveFromQueueView({
+            model         : this.model,
+            showBlacklist : showBlacklist
+        }));
     },
 
     _import : function() {
@@ -65,4 +65,3 @@ define(
         });
     }
 });
-    });

src/UI/Activity/Queue/QueueActionsCellTemplate.hbs

@@ -1,4 +1,4 @@
-{{#if_eq status compare="Completed"}}
+{{#if_eq status compare="Completed"}}
     {{#if_eq trackedDownloadStatus compare="Warning"}}
         <i class="icon-inbox x-import" title="Force import"></i>
     {{/if_eq}}

src/UI/Activity/Queue/QueueCollection.js

@@ -4,19 +4,24 @@ var PageableCollection = require('backbone.pageable');
 var QueueModel = require('./QueueModel');
 require('../../Mixins/backbone.signalr.mixin');
 
-module.exports = (function(){
 var QueueCollection = PageableCollection.extend({
     url   : window.NzbDrone.ApiRoot + '/queue',
     model : QueueModel,
-        state       : {pageSize : 15},
+
+    state : {
+        pageSize : 15
+    },
+
     mode : 'client',
+
     findEpisode : function(episodeId) {
         return _.find(this.fullCollection.models, function(queueModel) {
             return queueModel.get('episode').id === episodeId;
         });
     }
 });
+
 var collection = new QueueCollection().bindSignalR();
 collection.fetch();
-    return collection;
+
-}).call(this);
+module.exports = collection;

src/UI/Activity/Queue/QueueLayout.js

@@ -1,33 +1,18 @@
-'use strict';
+var Marionette = require('marionette');
-define(
+var Backgrid = require('backgrid');
-    [
+var QueueCollection = require('./QueueCollection');
-        'marionette',
+var SeriesTitleCell = require('../../Cells/SeriesTitleCell');
-        'backgrid',
+var EpisodeNumberCell = require('../../Cells/EpisodeNumberCell');
-        'Activity/Queue/QueueCollection',
+var EpisodeTitleCell = require('../../Cells/EpisodeTitleCell');
-        'Cells/SeriesTitleCell',
+var QualityCell = require('../../Cells/QualityCell');
-        'Cells/EpisodeNumberCell',
+var QueueStatusCell = require('./QueueStatusCell');
-        'Cells/EpisodeTitleCell',
+var QueueActionsCell = require('./QueueActionsCell');
-        'Cells/QualityCell',
+var TimeleftCell = require('./TimeleftCell');
-        'Activity/Queue/QueueStatusCell',
+var ProgressCell = require('./ProgressCell');
-        'Activity/Queue/QueueActionsCell',
+var ProtocolCell = require('../../Release/ProtocolCell');
-        'Activity/Queue/TimeleftCell',
+var GridPager = require('../../Shared/Grid/Pager');
-        'Activity/Queue/ProgressCell',
+
-        'Release/ProtocolCell',
+module.exports = Marionette.Layout.extend({
-        'Shared/Grid/Pager'
-    ], function (Marionette,
-                 Backgrid,
-                 QueueCollection,
-                 SeriesTitleCell,
-                 EpisodeNumberCell,
-                 EpisodeTitleCell,
-                 QualityCell,
-                 QueueStatusCell,
-                 QueueActionsCell,
-                 TimeleftCell,
-                 ProgressCell,
-                 ProtocolCell,
-                 GridPager) {
-        return Marionette.Layout.extend({
     template : 'Activity/Queue/QueueLayoutTemplate',
 
     regions : {
@@ -35,8 +20,7 @@ define(
         pager : '#x-queue-pager'
     },
 
-            columns:
+    columns : [
-                [
         {
             name      : 'status',
             label     : '',
@@ -113,4 +97,3 @@ define(
         }));
     }
 });
-    });

src/UI/Activity/Queue/QueueLayoutTemplate.hbs

@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12 table-responsive">
         <div id="x-queue" class="queue"/>
     </div>

src/UI/Activity/Queue/QueueStatusCell.js

@@ -4,8 +4,10 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell');
 module.exports = NzbDroneCell.extend({
     className : 'queue-status-cell',
     template  : 'Activity/Queue/QueueStatusCellTemplate',
+
     render : function() {
         this.$el.empty();
+
         if (this.cellValue) {
             var status = this.cellValue.get('status').toLowerCase();
             var trackedDownloadStatus = this.cellValue.has('trackedDownloadStatus') ? this.cellValue.get('trackedDownloadStatus').toLowerCase() : 'ok';
@@ -13,47 +15,57 @@ module.exports = NzbDroneCell.extend({
             var title = 'Downloading';
             var itemTitle = this.cellValue.get('title');
             var content = itemTitle;
+
             if (status === 'paused') {
                 icon = 'icon-pause';
                 title = 'Paused';
             }
+
             if (status === 'queued') {
                 icon = 'icon-cloud';
                 title = 'Queued';
             }
+
             if (status === 'completed') {
                 icon = 'icon-inbox';
                 title = 'Downloaded';
             }
+
             if (status === 'pending') {
                 icon = 'icon-time';
                 title = 'Pending';
             }
+
             if (status === 'failed') {
                 icon = 'icon-nd-download-failed';
                 title = 'Download failed';
             }
+
             if (status === 'warning') {
                 icon = 'icon-nd-download-warning';
                 title = 'Download warning: check download client for more details';
             }
+
             if (trackedDownloadStatus === 'warning') {
                 icon += ' icon-nd-warning';
+
                 this.templateFunction = Marionette.TemplateCache.get(this.template);
                 content = this.templateFunction(this.cellValue.toJSON());
             }
+
             if (trackedDownloadStatus === 'error') {
                 if (status === 'completed') {
                     icon = 'icon-nd-import-failed';
                     title = 'Import failed: ' + itemTitle;
-                }
+                } else {
-                else {
                     icon = 'icon-nd-download-failed';
                     title = 'Download failed';
                 }
+
                 this.templateFunction = Marionette.TemplateCache.get(this.template);
                 content = this.templateFunction(this.cellValue.toJSON());
             }
+
             this.$el.html('<i class="{0}"></i>'.format(icon));
             this.$el.popover({
                 content   : content,

src/UI/Activity/Queue/QueueView.js

@@ -4,29 +4,36 @@ var QueueCollection = require('./QueueCollection');
 
 module.exports = Marionette.ItemView.extend({
     tagName : 'span',
+
     initialize : function() {
         this.listenTo(QueueCollection, 'sync', this.render);
         QueueCollection.fetch();
     },
+
     render : function() {
         this.$el.empty();
+
         if (QueueCollection.length === 0) {
             return this;
         }
+
         var count = QueueCollection.fullCollection.length;
         var label = 'label-info';
+
         var errors = QueueCollection.fullCollection.some(function(model) {
             return model.has('trackedDownloadStatus') && model.get('trackedDownloadStatus').toLowerCase() === 'error';
         });
+
         var warnings = QueueCollection.fullCollection.some(function(model) {
             return model.has('trackedDownloadStatus') && model.get('trackedDownloadStatus').toLowerCase() === 'warning';
         });
+
         if (errors) {
             label = 'label-danger';
-        }
+        } else if (warnings) {
-        else if(warnings) {
             label = 'label-warning';
         }
+
         this.$el.html('<span class="label {0}">{1}</span>'.format(label, count));
         return this;
     }

src/UI/Activity/Queue/RemoveFromQueueView.js

@@ -1,11 +1,7 @@
-'use strict';
+var vent = require('../../vent');
-define(
+var Marionette = require('marionette');
-    [
-        'vent',
-        'marionette'
-    ], function (vent, Marionette) {
 
-        return  Marionette.ItemView.extend({
+module.exports = Marionette.ItemView.extend({
     template : 'Activity/Queue/RemoveFromQueueViewTemplate',
 
     events : {
@@ -36,4 +32,3 @@ define(
         });
     }
 });
-    });

src/UI/Activity/Queue/TimeleftCell.js

@@ -6,26 +6,31 @@ var FormatHelpers = require('../../Shared/FormatHelpers');
 
 module.exports = NzbDroneCell.extend({
     className : 'timeleft-cell',
+
     render : function() {
         this.$el.empty();
+
         if (this.cellValue) {
             if (this.cellValue.get('status').toLowerCase() === 'pending') {
                 var ect = this.cellValue.get('estimatedCompletionTime');
                 var time = '{0} at {1}'.format(FormatHelpers.relativeDate(ect), moment(ect).format(UiSettingsModel.time(true, false)));
                 this.$el.html('-');
                 this.$el.attr('title', 'Will be processed during the first RSS Sync after {0}'.format(time));
+
                 return this;
             }
+
             var timeleft = this.cellValue.get('timeleft');
             var totalSize = fileSize(this.cellValue.get('size'), 1, false);
             var remainingSize = fileSize(this.cellValue.get('sizeleft'), 1, false);
+
             if (timeleft === undefined) {
                 this.$el.html('-');
-            }
+            } else {
-            else {
                 this.$el.html('<span title="{1} / {2}">{0}</span>'.format(timeleft, remainingSize, totalSize));
             }
         }
+
         return this;
     }
 });