broken

NzbDrone.ncrunchsolution

@@ -2,6 +2,7 @@
   <FileVersion>1</FileVersion>
   <AutoEnableOnStartup>False</AutoEnableOnStartup>
   <AllowParallelTestExecution>true</AllowParallelTestExecution>
+  <AllowTestsToRunInParallelWithThemselves>true</AllowTestsToRunInParallelWithThemselves>
   <FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
   <FrameworkUtilisationTypeForGallio>Disabled</FrameworkUtilisationTypeForGallio>
   <FrameworkUtilisationTypeForMSpec>Disabled</FrameworkUtilisationTypeForMSpec>

UI/AddSeries/AddSeriesLayout.js

@@ -1,14 +1,16 @@
 "use strict";
-define([
+define(
+    [
         'app',
-    'Quality/QualityProfileCollection',
+        'marionette',
-    'AddSeries/RootFolders/RootFolderCollection',
+        'AddSeries/RootFolders/Layout',
-    'AddSeries/RootFolders/RootFolderView',
+        'AddSeries/Existing/CollectionView',
         'AddSeries/AddSeriesView',
-    'AddSeries/Existing/ImportSeriesView'
+        'Quality/QualityProfileCollection',
-],
+        'AddSeries/RootFolders/Collection'
-    function (app, qualityProfileCollection, rootFolderCollection) {
+    ], function (App, Marionette, RootFolderLayout, ExistingSeriesCollectionView, AddSeriesView, qualityProfileCollection, rootFolderCollection) {
-        NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
+
+        return Marionette.Layout.extend({
             template: 'AddSeries/addSeriesLayoutTemplate',
 
             regions: {
@@ -20,25 +22,24 @@ define([
             },
 
             initialize: function () {
-                this.rootFolderLayout = new NzbDrone.AddSeries.RootFolders.Layout();
+                this.rootFolderLayout = new RootFolderLayout();
                 this.rootFolderLayout.on('folderSelected', this._folderSelected, this);
 
+                qualityProfileCollection.fetch();
+                rootFolderCollection.fetch();
             },
 
-            _folderSelected: function (options) {
+            onShow: function () {
-                NzbDrone.modalRegion.closeModal();
+                this.workspace.show(new AddSeriesView());
-                this.workspace.show(new NzbDrone.AddSeries.Existing.ListView({model: options.model}));
             },
 
-            onRender: function () {
+            _folderSelected: function (options) {
-                qualityProfileCollection.fetch();
+                App.modalRegion.closeModal();
-                rootFolderCollection.fetch();
+                this.workspace.show(new ExistingSeriesCollectionView({model: options.model}));
-
-                this.workspace.show(new NzbDrone.AddSeries.AddSeriesView());
             },
 
             _importSeries: function () {
-                NzbDrone.modalRegion.show(this.rootFolderLayout);
+                App.modalRegion.show(this.rootFolderLayout);
             }
         });
     });

UI/AddSeries/AddSeriesView.js

@@ -1,10 +1,16 @@
 "use strict";
-define(['app',
+define(
-    'AddSeries/RootFolders/RootFolderCollection',
+    [
-    'AddSeries/SearchResultView',
+        'marionette',
+        'AddSeries/Collection',
+        'AddSeries/SearchResultCollectionView',
         'Shared/SpinnerView',
-    'AddSeries/Collection'], function () {
+        'app',
-    NzbDrone.AddSeries.AddSeriesView = Backbone.Marionette.Layout.extend({
+        'AddSeries/RootFolders/Collection',
+        'AddSeries/SearchResultView',
+        'Shared/SpinnerView'
+    ], function (Marionette, AddSeriesCollection, SearchResultCollectionView, SpinnerView) {
+        return Marionette.Layout.extend({
             template: 'AddSeries/AddSeriesTemplate',
 
             ui: {
@@ -16,20 +22,18 @@ define(['app',
             },
 
             initialize: function () {
-            this.collection = new NzbDrone.AddSeries.Collection();
+                this.collection = new AddSeriesCollection();
             },
 
             onRender: function () {
                 var self = this;
 
-            this.ui.seriesSearch
+                this.ui.seriesSearch.data('timeout', null).keyup(function () {
-                .data('timeout', null)
-                .keyup(function () {
                     window.clearTimeout(self.$el.data('timeout'));
                     self.$el.data('timeout', window.setTimeout(self.search, 500, self));
                 });
 
-            this.resultView = new NzbDrone.AddSeries.SearchResultCollectionView({ collection: this.collection });
+                this.resultView = new SearchResultCollectionView({ collection: this.collection });
             },
 
             search: function (context) {
@@ -41,8 +45,9 @@ define(['app',
 
                 if (term === '') {
                     context.searchResult.close();
-            } else {
+                }
-                context.searchResult.show(new NzbDrone.Shared.SpinnerView());
+                else {
+                    context.searchResult.show(new SpinnerView());
 
                     context.currentSearchRequest = context.collection.fetch({
                         data   : { term: term },

UI/AddSeries/Collection.js

@@ -1,8 +1,13 @@
 "use strict";
-define(['app', 'Series/SeriesModel'], function () {
+define(
-    NzbDrone.AddSeries.Collection = Backbone.Collection.extend({
+    [
-        url  : NzbDrone.Constants.ApiRoot + '/series/lookup',
+        'App',
-        model: NzbDrone.Series.SeriesModel,
+        'backbone',
+        'Series/SeriesModel'
+    ], function (App, Backbone, SeriesModel) {
+        return Backbone.Collection.extend({
+            url  : Constants.ApiRoot + '/series/lookup',
+            model: SeriesModel,
 
             parse: function (response) {
 

UI/AddSeries/Existing/CollectionView.js

@@ -0,0 +1,40 @@
+'use strict';
+define(
+    [
+        'marionette',
+        'AddSeries/Existing/CompositeView',
+        'AddSeries/Existing/UnmappedFolderCollection'
+    ], function (Marionette, UnmappedFolderCompositeView, UnmappedFolderCollection) {
+
+        return Marionette.CollectionView.extend({
+
+            itemView: UnmappedFolderCompositeView,
+
+            initialize: function () {
+                this.collection = new UnmappedFolderCollection();
+                this.refreshItems();
+            },
+
+            refreshItems: function () {
+                this.collection.importItems(this.model);
+            },
+
+            showCollection: function () {
+                this._showAndSearch(0);
+            },
+
+            _showAndSearch: function (index) {
+
+                var model = this.collection.at(index);
+                if (model) {
+                    var that = this;
+                    var currentIndex = index;
+                    this.addItemView(model, this.getItemView(), index);
+                    $.when(this.children.findByModel(model).search()).then(function () {
+                        that._showAndSearch(currentIndex + 1);
+                    });
+                }
+            }
+
+        });
+    });

UI/AddSeries/Existing/CompositeView.js

@@ -0,0 +1,106 @@
+'use strict';
+define(
+    [
+        'marionette',
+        'AddSeries/Collection',
+        'AddSeries/SearchResultView'
+    ], function (Marionette, AddSeriesCollection, SearchResultView) {
+
+        return Marionette.CompositeView.extend({
+
+            template         : 'AddSeries/Existing/UnmappedFolderCompositeViewTemplate',
+            itemViewContainer: '.x-folder-name-match-results',
+            itemView         : SearchResultView,
+
+            events: {
+                'click .x-btn-search'  : 'search',
+                'click .x-load-more'   : '_loadMore',
+                'keydown .x-txt-search': 'keyDown'
+            },
+
+            ui: {
+                searchButton: '.x-btn-search',
+                searchText  : '.x-txt-search',
+                searchBar   : '.x-search-bar',
+                loadMore    : '.x-load-more'
+            },
+
+            initialize: function () {
+                this.collection = new AddSeriesCollection();
+
+                this.on("item:removed", function () {
+                    this.close();
+                }, this);
+            },
+
+            onRender: function () {
+                this.ui.loadMore.show();
+            },
+
+            search: function () {
+                var icon = this.ui.searchButton.find('icon');
+                icon.removeClass('icon-search').addClass('icon-spin icon-spinner disabled');
+
+                var self = this;
+                var deferred = $.Deferred();
+
+                this.collection.reset();
+
+                this.searchCollection = new AddSeriesCollection();
+
+                this.searchCollection.fetch({
+                    data   : { term: this.ui.searchText.val() },
+                    success: function () {
+                        icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
+                        deferred.resolve();
+                        self.collection.add(self.searchCollection.shift());
+
+                        if (self.showall) {
+                            self._showAll();
+                        }
+
+                    },
+                    fail   : function () {
+                        icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
+                        deferred.reject();
+                    }
+                });
+
+                return deferred.promise();
+            },
+
+
+            keyDown: function (e) {
+                //Check for enter being pressed
+                var code = (e.keyCode ? e.keyCode :e.which);
+                if (code === 13) {
+                    this.search();
+                }
+            },
+
+            _loadMore: function () {
+                this.showall = true;
+
+                this.ui.searchBar.fadeIn();
+                this.ui.loadMore.fadeOut();
+
+                this._showAll();
+            },
+
+            _showAll: function () {
+                var self = this;
+                this.searchCollection.each(function (searchResult) {
+                    self.collection.add(searchResult);
+                });
+            },
+
+            itemViewOptions: function () {
+                return {
+                    rootFolder: this.model.get('rootFolder'),
+                    folder    : this.model.get('folder').path,
+                    isExisting: true
+                };
+            }
+        });
+
+    });

UI/AddSeries/Existing/ImportSeriesView.js

@@ -1,139 +0,0 @@
-'use strict';
-define([
-    'app', 'AddSeries/RootFolders/RootFolderCollection',
-    'AddSeries/Existing/UnmappedFolderModel',
-    'AddSeries/Collection',
-    'AddSeries/SearchResultView',
-    'Series/SeriesModel'], function () {
-
-    NzbDrone.AddSeries.Existing.UnmappedFolderCompositeView = Backbone.Marionette.CompositeView.extend({
-
-        template         : 'AddSeries/Existing/UnmappedFolderCompositeViewTemplate',
-        itemViewContainer: '.x-folder-name-match-results',
-        itemView         : NzbDrone.AddSeries.SearchResultView,
-
-        events: {
-            'click .x-btn-search'  : 'search',
-            'click .x-load-more'   : '_loadMore',
-            'keydown .x-txt-search': 'keyDown'
-        },
-
-        ui: {
-            searchButton: '.x-btn-search',
-            searchText  : '.x-txt-search',
-            searchBar   : '.x-search-bar',
-            loadMore    : '.x-load-more'
-        },
-
-        initialize: function () {
-            this.collection = new NzbDrone.AddSeries.Collection();
-            this.collection.bind('reset', this.collectionReset, this);
-
-            this.on("item:removed", function () {
-                this.close();
-            }, this);
-        },
-
-        onRender: function () {
-            this.ui.loadMore.show();
-        },
-
-        search: function () {
-            var icon = this.ui.searchButton.find('icon');
-            icon.removeClass('icon-search').addClass('icon-spin icon-spinner disabled');
-
-            var self = this;
-            var deferred = $.Deferred();
-
-            this.collection.reset();
-
-            this.searchCollection = new NzbDrone.AddSeries.Collection();
-
-            this.searchCollection.fetch({
-                data   : { term: this.ui.searchText.val() },
-                success: function () {
-                    icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
-                    deferred.resolve();
-                    self.collection.add(self.searchCollection.shift());
-
-                    if (self.showall) {
-                        self._showAll();
-                    }
-
-                },
-                fail   : function () {
-                    icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
-                    deferred.reject();
-                }
-            });
-
-            return deferred.promise();
-        },
-
-
-        keyDown: function (e) {
-            //Check for enter being pressed
-            var code = (e.keyCode ? e.keyCode :e.which);
-            if (code === 13) {
-                this.search();
-            }
-        },
-
-        _loadMore: function () {
-            this.showall = true;
-
-            this.ui.searchBar.fadeIn();
-            this.ui.loadMore.fadeOut();
-
-            this._showAll();
-        },
-
-        _showAll: function () {
-            var self = this;
-            this.searchCollection.each(function (searchResult) {
-                self.collection.add(searchResult);
-            });
-        },
-
-        itemViewOptions: function () {
-            return {
-                rootFolder    : this.model.get('rootFolder'),
-                folder        : this.model.get('folder').path,
-                isExisting    : true
-            };
-        }
-    });
-
-    NzbDrone.AddSeries.Existing.ListView = Backbone.Marionette.CollectionView.extend({
-
-        itemView: NzbDrone.AddSeries.Existing.UnmappedFolderCompositeView,
-
-        initialize: function () {
-            this.collection = new NzbDrone.AddSeries.Existing.UnmappedFolderCollection();
-            this.refreshItems();
-        },
-
-        refreshItems: function () {
-            this.collection.importItems(this.model);
-        },
-
-        showCollection: function () {
-            this.showAndSearch(0);
-        },
-
-        showAndSearch: function (index) {
-
-            var model = this.collection.at(index);
-            if (model) {
-                var that = this;
-                var currentIndex = index;
-                this.addItemView(model, this.getItemView(), index);
-                $.when(this.children.findByModel(model).search())
-                    .then(function () {
-                        that.showAndSearch(currentIndex + 1);
-                    });
-            }
-        }
-
-    });
-});

UI/AddSeries/Existing/UnmappedFolderCollection.js

@@ -0,0 +1,23 @@
+'use strict';
+define(
+    [
+        'backbone',
+        'AddSeries/Existing/UnmappedFolderModel'
+    ], function (Backbone, UnmappedFolderModel) {
+        return Backbone.Collection.extend({
+            model: UnmappedFolderModel,
+
+            importItems: function (rootFolderModel) {
+
+                this.reset();
+                var rootFolder = rootFolderModel;
+
+                _.each(rootFolderModel.get('unmappedFolders'), function (folder) {
+                    this.push(new UnmappedFolderModel({
+                        rootFolder: rootFolder,
+                        folder    : folder
+                    }));
+                }, this);
+            }
+        });
+    });

UI/AddSeries/Existing/UnmappedFolderModel.js

@@ -1,21 +1,10 @@
 'use strict';
-define(['app'], function () {
 
+define(
+    [
+        'backbone'
+    ], function (Backbone) {
+        return Backbone.Model.extend({
 
-    NzbDrone.AddSeries.Existing.UnmappedFolderModel = Backbone.Model.extend({
-    });
-
-    NzbDrone.AddSeries.Existing.UnmappedFolderCollection = Backbone.Collection.extend({
-        model: NzbDrone.AddSeries.Existing.UnmappedFolderModel,
-
-        importItems: function (rootFolderModel) {
-
-            this.reset();
-            var rootFolder = rootFolderModel;//.get('path');
-
-            _.each(rootFolderModel.get('unmappedFolders'), function (folder) {
-                this.push(new NzbDrone.AddSeries.Existing.UnmappedFolderModel({ rootFolder: rootFolder, folder: folder}));
-            }, this);
-        }
         });
     });

UI/AddSeries/RootFolders/Collection.js

@@ -0,0 +1,15 @@
+"use strict";
+define(
+    [
+        'app',
+        'AddSeries/RootFolders/Model',
+        'mixins/backbone.signalr.mixin'
+    ], function () {
+
+        var rootFolderCollection = Backbone.Collection.extend({
+            url  : NzbDrone.Constants.ApiRoot + '/rootfolder',
+            model: NzbDrone.AddSeries.RootFolders.RootFolderModel
+        });
+
+        return new rootFolderCollection().BindSignalR();
+    });

UI/AddSeries/RootFolders/CollectionView.js

@@ -0,0 +1,16 @@
+"use strict";
+
+define(
+    [
+        'marionette',
+        'AddSeries/RootFolders/ItemView'
+    ], function (Marionette, RootFolderItemView) {
+
+
+        return Marionette.CollectionView.extend({
+            itemView: RootFolderItemView,
+
+            tagName  : 'table',
+            className: 'table table-hover'
+        });
+    });

UI/AddSeries/RootFolders/ItemView.js

@@ -0,0 +1,27 @@
+"use strict";
+
+define(
+    [
+        'marionette'
+    ], function (Marionette) {
+
+        return Marionette.ItemView.extend({
+
+            template: 'AddSeries/RootFolders/RootFolderItemTemplate',
+            tagName : 'tr',
+
+            events: {
+                'click .x-remove': 'removeFolder',
+                'click .x-folder': 'folderSelected'
+            },
+
+            removeFolder: function () {
+                this.model.destroy({ wait: true });
+                this.model.collection.remove(this.model);
+            },
+
+            folderSelected: function () {
+                this.trigger('folderSelected', this.model);
+            }
+        });
+    });

UI/AddSeries/RootFolders/Layout.js

@@ -0,0 +1,57 @@
+"use strict";
+
+define(
+    [
+        'marionette',
+        'AddSeries/RootFolders/CollectionView',
+        'AddSeries/RootFolders/Model',
+        'AddSeries/RootFolders/Collection',
+        'Mixins/AutoComplete'
+    ], function (Marionette, RootFolderCollectionView, RootFolderCollection, RootFolderModel) {
+
+        return Marionette.Layout.extend({
+            template: 'AddSeries/RootFolders/LayoutTemplate',
+
+            ui: {
+                pathInput: '.x-path input'
+            },
+
+            regions: {
+                currentDirs: '#current-dirs'
+            },
+
+            events: {
+                'click .x-add': 'addFolder'
+            },
+
+            initialize: function () {
+                this.collection = RootFolderCollection;
+                this.rootfolderListView = new RootFolderCollectionView({ collection: RootFolderCollection });
+                this.rootfolderListView.on('itemview:folderSelected', this._onFolderSelected, this);
+            },
+
+
+            onRender: function () {
+
+                this.currentDirs.show(this.rootfolderListView);
+                this.ui.pathInput.autoComplete('/directories');
+            },
+
+            _onFolderSelected: function (options) {
+                this.trigger('folderSelected', options);
+            },
+
+            addFolder: function () {
+                var newDir = new RootFolderModel({
+                    Path: this.ui.pathInput.val()
+                });
+
+                RootFolderCollection.create(newDir, {
+                    wait: true, success: function () {
+                        RootFolderCollection.fetch();
+                    }
+                });
+            }
+        });
+
+    });

UI/AddSeries/RootFolders/RootFolderCollection.js

@@ -1,10 +0,0 @@
-"use strict";
-define(['app', 'AddSeries/RootFolders/RootFolderModel','mixins/backbone.signalr.mixin'], function () {
-
-    var rootFolderCollection = Backbone.Collection.extend({
-        url  : NzbDrone.Constants.ApiRoot + '/rootfolder',
-        model: NzbDrone.AddSeries.RootFolders.RootFolderModel
-    });
-
-    return new rootFolderCollection().BindSignalR();
-});

UI/AddSeries/RootFolders/RootFolderTemplateHelper.js

@@ -1,10 +1,12 @@
 'use strict';
 
-define(['app', 'AddSeries/RootFolders/RootFolderCollection','handlebars'], function (app, rootFolders, Handlebars) {
+define(
+    [
+        'AddSeries/RootFolders/Collection',
+        'handlebars'
+    ], function (rootFolders, Handlebars) {
 
         Handlebars.registerHelper('rootFolderSelection', function () {
-        //TODO: We should be able to pass in the context, either an object or a property
-
             var templateFunction = Marionette.TemplateCache.get('AddSeries/RootFolders/RootFolderSelectionTemplate');
             return new Handlebars.SafeString(templateFunction(rootFolders.toJSON()));
         });

UI/AddSeries/RootFolders/RootFolderView.js

@@ -1,79 +0,0 @@
-"use strict";
-
-define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Mixins/AutoComplete'], function (app, rootFolders) {
-
-    NzbDrone.AddSeries.RootFolderItemView = Backbone.Marionette.ItemView.extend({
-
-        template: 'AddSeries/RootFolders/RootFolderItemTemplate',
-        tagName : 'tr',
-
-        events: {
-            'click .x-remove': 'removeFolder',
-            'click .x-folder': 'folderSelected'
-        },
-
-        removeFolder: function () {
-            this.model.destroy({ wait: true });
-            this.model.collection.remove(this.model);
-        },
-
-        folderSelected: function () {
-            this.trigger('folderSelected', this.model);
-        }
-    });
-
-    NzbDrone.AddSeries.RootDirListView = Backbone.Marionette.CollectionView.extend({
-        itemView: NzbDrone.AddSeries.RootFolderItemView,
-
-        tagName  : 'table',
-        className: 'table table-hover'
-    });
-
-    NzbDrone.AddSeries.RootFolders.Layout = Backbone.Marionette.Layout.extend({
-        template: 'AddSeries/RootFolders/LayoutTemplate',
-
-        ui: {
-            pathInput: '.x-path input'
-        },
-
-        regions: {
-            currentDirs: '#current-dirs'
-        },
-
-        events: {
-            'click .x-add': 'addFolder'
-        },
-
-        initialize: function () {
-            this.collection = rootFolders;
-            this.rootfolderListView = new NzbDrone.AddSeries.RootDirListView({ collection: rootFolders });
-            this.rootfolderListView.on('itemview:folderSelected', this._onFolderSelected, this);
-        },
-
-
-        onRender: function () {
-
-            this.currentDirs.show(this.rootfolderListView);
-            this.ui.pathInput.autoComplete('/directories');
-        },
-
-        _onFolderSelected: function (options) {
-            this.trigger('folderSelected', options);
-        },
-
-        addFolder: function () {
-            var newDir = new NzbDrone.AddSeries.RootFolders.RootFolderModel(
-                {
-                    Path: this.ui.pathInput.val()
-                });
-
-
-            rootFolders.create(newDir, {
-                wait: true, success: function () {
-                    rootFolders.fetch();
-                }
-            });
-        }
-    });
-
-});

UI/AddSeries/SearchResultCollectionView.js

@@ -0,0 +1,16 @@
+'use strict';
+define(
+    [
+        'marionette',
+        'AddSeries/SearchResultView'
+    ], function (Marionette, SearchResultView) {
+
+        return Marionette.CollectionView.extend({
+
+            itemView  : SearchResultView,
+            initialize: function () {
+                this.listenTo(this.collection, 'reset', this.render);
+            }
+
+        });
+    });

UI/AddSeries/SearchResultView.js

@@ -1,12 +1,15 @@
 'use strict';
-define(['app',
+define(
-    'Quality/QualityProfileCollection',
+    [
+        'app',
+        'marionette',
         'Config',
         'Series/SeriesCollection',
-    'AddSeries/RootFolders/RootFolderTemplateHelper',
+        'Shared/Messenger',
-    'Quality/QualityProfileTemplateHelper'], function (app, qualityProfiles) {
+        'Quality/QualityProfileCollection'
+    ], function (App, Marionette, Config, SeriesCollection, Messenger, QualityProfiles) {
 
-    NzbDrone.AddSeries.SearchResultView = Backbone.Marionette.ItemView.extend({
+        return Marionette.ItemView.extend({
 
             template: "AddSeries/SearchResultTemplate",
 
@@ -31,27 +34,27 @@ define(['app',
                 this.model.set('isExisting', this.options.isExisting);
                 this.model.set('path', this.options.folder);
 
-            NzbDrone.vent.on(NzbDrone.Config.Events.ConfigUpdatedEvent, this._onConfigUpdated, this);
+                App.vent.on(Config.Events.ConfigUpdatedEvent, this._onConfigUpdated, this);
             },
 
 
             _onConfigUpdated: function (options) {
 
-            if (options.key === NzbDrone.Config.Keys.DefaultQualityProfileId) {
+                if (options.key === Config.Keys.DefaultQualityProfileId) {
                     this.$('.x-quality-profile').val(options.value);
                 }
             },
 
             _qualityProfileChanged: function () {
-            NzbDrone.Config.SetValue(NzbDrone.Config.Keys.DefaultQualityProfileId, this.ui.qualityProfile.val());
+                Config.SetValue(Config.Keys.DefaultQualityProfileId, this.ui.qualityProfile.val());
             },
 
             onRender: function () {
                 this.listenTo(this.model, 'change', this.render);
 
-            var defaultQuality = NzbDrone.Config.GetValue(NzbDrone.Config.Keys.DefaultQualityProfileId);
+                var defaultQuality = Config.GetValue(Config.Keys.DefaultQualityProfileId);
 
-            if (qualityProfiles.get(defaultQuality)) {
+                if (QualityProfiles.get(defaultQuality)) {
                     this.ui.qualityProfile.val(defaultQuality);
                 }
             },
@@ -70,15 +73,15 @@ define(['app',
                 var self = this;
 
                 this.model.save(undefined, {
-                url    : NzbDrone.Series.SeriesCollection.prototype.url,
+                    url    : SeriesCollection.prototype.url,
                     success: function () {
                         self.close();
                         icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
-                    NzbDrone.Shared.Messenger.show({
+                        Messenger.show({
                             message: 'Added: ' + self.model.get('title')
                         });
 
-                    NzbDrone.vent.trigger(NzbDrone.Events.SeriesAdded, { series: self.model });
+                        App.vent.trigger(App.Events.SeriesAdded, { series: self.model });
                         self.model.collection.remove(self.model);
                     },
                     fail   : function () {
@@ -89,13 +92,4 @@ define(['app',
         });
 
 
-    NzbDrone.AddSeries.SearchResultCollectionView = Backbone.Marionette.CollectionView.extend({
-
-        itemView  : NzbDrone.AddSeries.SearchResultView,
-        initialize: function () {
-            this.listenTo(this.collection, 'reset', this.render);
-        }
-
-    });
-
     });

UI/Config.js

@@ -1,5 +1,8 @@
 "use strict";
-define(['app'], function () {
+define(
+    [
+        'app'
+    ], function () {
 
         NzbDrone.Config = {
             Events: {
@@ -34,4 +37,6 @@ define(['app'], function () {
 
         };
 
+        return NzbDrone.Config;
+
     });

UI/RouteBinder.js

@@ -1,12 +1,15 @@
 "use strict";
-define(['app'], function () {
+define(function () {
 
     //This module will automatically route all links through backbone router rather than
     //causing links to reload pages.
 
     var routeBinder = {
 
-        bind: function () {
+        bind: function (router) {
+
+            this._router = router;
+
             $(document).on('click', 'a[href]', this._handleClick);
         },
 
@@ -44,7 +47,7 @@ define(['app'], function () {
 
 
             if (!href.startsWith('http')) {
-                NzbDrone.Router.navigate(href, { trigger: true });
+                this._router.navigate(href, { trigger: true });
             }
 
             else {

UI/Router.js

@@ -0,0 +1,29 @@
+"use strict";
+require(
+    [
+        'marionette',
+        'Controller'
+    ], function (Marionette, Controller) {
+
+        return Marionette.AppRouter.extend({
+
+            controller: Controller,
+            appRoutes : {
+                ''                           : 'series',
+                'series'                     : 'series',
+                'series/index'               : 'series',
+                'series/add'                 : 'addSeries',
+                'series/add/:action(/:query)': 'addSeries',
+                'series/details/:query'      : 'seriesDetails',
+                'calendar'                   : 'calendar',
+                'settings'                   : 'settings',
+                'settings/:action(/:query)'  : 'settings',
+                'missing'                    : 'missing',
+                'history'                    : 'history',
+                'logs'                       : 'logs',
+                'rss'                        : 'rss',
+                ':whatever'                  : 'notFound'
+            }
+        });
+    });
+

UI/Routing.js

@@ -1,34 +0,0 @@
-"use strict";
-require(['Controller', 'RouteBinder', 'Shared/Footer/View'], function (Controller, RouteBinder, FooterView) {
-
-    NzbDrone.Router = Backbone.Marionette.AppRouter.extend({
-
-        controller: Controller,
-        appRoutes : {
-            ''                           : 'series',
-            'series'                     : 'series',
-            'series/index'               : 'series',
-            'series/add'                 : 'addSeries',
-            'series/add/:action(/:query)': 'addSeries',
-            'series/details/:query'      : 'seriesDetails',
-            'calendar'                   : 'calendar',
-            'settings'                   : 'settings',
-            'settings/:action(/:query)'  : 'settings',
-            'missing'                    : 'missing',
-            'history'                    : 'history',
-            'logs'                       : 'logs',
-            'rss'                        : 'rss',
-            ':whatever'                  : 'notFound'
-        }
-    });
-
-    NzbDrone.addInitializer(function () {
-
-        NzbDrone.Router = new NzbDrone.Router();
-        Backbone.history.start({ pushState: true });
-
-        RouteBinder.bind();
-        NzbDrone.footerRegion.show(new FooterView());
-    });
-});
-

UI/ServerStatus.js

@@ -1,7 +1,7 @@
 var statusText = $.ajax({
     type : "GET",
-    url  : 'api/system/status',
+    url  : '/api/system/status',
-    async: false,
+    async: false
 }).responseText;
 
 window.ServerStatus = JSON.parse(statusText);

UI/Shared/FormatHelpers.js

@@ -32,4 +32,6 @@ define(['app'], function () {
 
         return date.format('{MM}/{dd}/{yyyy}');
     };
+
+    return NzbDrone.Shared.FormatHelpers;
 });

UI/Shared/SpinnerView.js

@@ -1,10 +1,15 @@
 "use strict";
 
-define(['app'], function () {
+define(
+    [
+        'app'
+    ], function () {
         NzbDrone.Shared.SpinnerView = Backbone.Marionette.ItemView.extend({
             template : 'Shared/SpinnerTemplate',
             className: 'nz-spinner row'
         });
+
+        return  NzbDrone.Shared.SpinnerView;
     });
 
 

UI/Shared/TemplateHelpers.js

@@ -1,6 +1,6 @@
 "use strict";
 
-define(['app','handlebars'], function (App,Handlebars) {
+define(['app','handlebars','Shared/FormatHelpers'], function (App,Handlebars) {
     Handlebars.registerHelper('partial', function (templateName) {
         //TODO: We should be able to pass in the context, either an object or a property
 

UI/Shared/Toolbar/Radio/RadioButtonCollectionView.js

@@ -1,5 +1,10 @@
 "use strict";
-define(['app', 'Shared/Toolbar/Radio/RadioButtonView', 'Config'], function () {
+define(
+    [
+        'app',
+        'Shared/Toolbar/Radio/RadioButtonView',
+        'Config'
+    ], function (App, RadioButtonView, Config) {
         NzbDrone.Shared.Toolbar.RadioButtonCollectionView = Backbone.Marionette.CollectionView.extend({
             className: 'btn-group',
             itemView : NzbDrone.Shared.Toolbar.RadioButtonView,
@@ -17,7 +22,7 @@ define(['app', 'Shared/Toolbar/Radio/RadioButtonView', 'Config'], function () {
             },
 
             setActive: function () {
-            var storedKey = NzbDrone.Config.GetValue(this.menu.menuKey, this.menu.defaultAction);
+                var storedKey = Config.GetValue(this.menu.menuKey, this.menu.defaultAction);
 
                 this.collection.each(function (model) {
                     if (model.get('key').toLocaleLowerCase() === storedKey.toLowerCase()) {

UI/app.js

@@ -1,7 +1,7 @@
 "use strict";
 require.config({
 
-    urlArgs: 'bust=' + window.ServerStatus.version,
+    urlArgs: 'v=' + window.ServerStatus.version,
 
     paths: {
         'backbone'            : 'JsLibraries/backbone',
@@ -22,6 +22,7 @@ require.config({
         'marionette'          : 'JsLibraries/backbone.marionette',
         'signalR'             : 'JsLibraries/jquery.signalR',
         'libs'                : 'JsLibraries/'
+
     },
 
     shim: {
@@ -147,9 +148,10 @@ define(
     [
         'marionette',
         'shared/modal/region',
+        'router',
         'Instrumentation/StringFormat',
         'Instrumentation/ErrorHandler'
-    ], function (Marionette, ModalRegion) {
+    ], function (Marionette, ModalRegion, Router, RouteBinder) {
 
         require(
             [
@@ -234,6 +236,13 @@ define(
         window.NzbDrone.start();
 
 
+        NzbDrone.Router = new Router();
+        Backbone.history.start({ pushState: true });
+
+        RouteBinder.bind(NzbDrone.Router);
+        //NzbDrone.footerRegion.show(new FooterView());
+
+
         window.require(
             [
                 'Routing'