making modals event driven,

UI/AddSeries/AddSeriesLayout.js

@@ -49,7 +49,8 @@ define(
             },
 
             _folderSelected: function (options) {
-                App.modalRegion.closeModal();
+                App.vent.trigger(App.Commands.CloseModalCommand);
+
                 this.workspace.show(new ExistingSeriesCollectionView({model: options.model}));
             },
 

UI/AddSeries/SearchResultView.js

@@ -98,7 +98,7 @@ define(
             },
 
             _setRootFolder: function (options) {
-                App.modalRegion.closeModal();
+                App.vent.trigger(App.Commands.CloseModalCommand);
                 this.ui.rootFolder.val(options.model.id);
             },
 

UI/Calendar/CalendarView.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 
 define(
     [
@@ -6,7 +6,6 @@ define(
         'marionette',
         'moment',
         'Calendar/Collection',
-        'Episode/Layout',
         'fullcalendar'
     ], function (App, Marionette, Moment, CalendarCollection, EpisodeLayout) {
 

UI/Constants.js

@@ -1,4 +0,0 @@
-'use strict';
-define({
-    ApiRoot  : '/api'
-});

UI/Episode/Search/Layout.js

@@ -49,7 +49,7 @@ define(
                     message: 'Search started for: ' + message
                 });
 
-                App.modalRegion.closeModal();
+                App.vent.trigger(App.Commands.CloseModalCommand);
             },
 
             _searchManual: function (e) {

UI/History/Collection.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 define(
     [
         'History/Model',

UI/Series/Delete/DeleteSeriesView.js

@@ -25,7 +25,7 @@ define(
                     wait: true
                 }).done(function () {
                         App.vent.trigger(App.Events.SeriesDeleted, { series: self.model });
-                        App.modalRegion.closeModal();
+                        App.vent.trigger(App.Commands.CloseModalCommand);
                     });
             }
         });

UI/Series/Details/SeriesDetailsLayout.js

@@ -6,11 +6,10 @@ define(
         'Series/EpisodeCollection',
         'Series/SeasonCollection',
         'Series/Details/SeasonCollectionView',
-        'Series/Edit/EditSeriesView',
         'Shared/LoadingView',
         'Shared/Actioneer',
         'backstrech'
-    ], function (App, Marionette, EpisodeCollection, SeasonCollection, SeasonCollectionView, EditSeriesView, LoadingView, Actioneer) {
+    ], function (App, Marionette, EpisodeCollection, SeasonCollection, SeasonCollectionView, LoadingView, Actioneer) {
         return Marionette.Layout.extend({
 
             itemViewContainer: '.x-series-seasons',
@@ -117,8 +116,7 @@ define(
             },
 
             _editSeries: function () {
-                var view = new EditSeriesView({ model: this.model });
+                App.vent.trigger(App.Commands.EditSeriesCommand, {model: this.model});
-                App.modalRegion.show(view);
             },
 
             _refreshSeries: function () {

UI/Series/Edit/EditSeriesView.js

@@ -1,7 +1,7 @@
 'use strict';
 define(
     [
-        'App',
+        'app',
         'marionette',
         'Series/Delete/DeleteSeriesView',
         'Quality/QualityProfileCollection',
@@ -18,8 +18,8 @@ define(
             },
 
             events: {
-                'click .x-save'  : 'saveSeries',
+                'click .x-save'  : '_saveSeries',
-                'click .x-remove': 'removeSeries'
+                'click .x-remove': '_removeSeries'
             },
 
 
@@ -28,22 +28,23 @@ define(
             },
 
 
-            saveSeries: function () {
+            _saveSeries: function () {
 
+                var self = this;
                 var qualityProfileId = this.ui.qualityProfile.val();
                 this.model.set({ qualityProfileId: qualityProfileId});
 
-                this.model.save();
+                this.model.save().done(function () {
-                this.trigger('saved');
+                    self.trigger('saved');
-                App.modalRegion.closeModal();
+                    App.vent.trigger(App.Commands.CloseModalCommand);
-
+                });
             },
 
             onRender: function () {
                 this.ui.path.autoComplete('/directories');
             },
 
-            removeSeries: function () {
+            _removeSeries: function () {
                 var view = new DeleteSeriesView({ model: this.model });
                 App.modalRegion.show(view);
             }

UI/Settings/Indexers/DeleteView.js

@@ -11,7 +11,7 @@ define(['app', 'marionette'], function (App, Marionette) {
             this.model.destroy({
                 wait   : true,
                 success: function () {
-                    App.modalRegion.closeModal();
+                    App.vent.trigger(App.Commands.CloseModalCommand);
                 }
             });
         }

UI/Settings/Indexers/EditView.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 
 define(
     [
@@ -26,7 +26,7 @@ define(
                 if (promise) {
                     promise.done(function () {
                         self.indexerCollection.add(self.model, { merge: true });
-                        App.modalRegion.closeModal();
+                        App.vent.trigger(App.Commands.CloseModalCommand);
                     });
                 }
             },

UI/Settings/Notifications/DeleteView.js

@@ -11,7 +11,7 @@ define(['app', 'marionette'], function (App, Marionette) {
             this.model.destroy({
                 wait   : true,
                 success: function () {
-                    App.modalRegion.closeModal();
+                    App.vent.trigger(App.Commands.CloseModalCommand);
                 }
             });
         }

UI/Settings/Notifications/EditView.js

@@ -39,7 +39,7 @@ define([
             if (promise) {
                 promise.done(function () {
                     self.notificationCollection.add(self.model, { merge: true });
-                    App.modalRegion.closeModal();
+                    App.vent.trigger(App.Commands.CloseModalCommand);
                 });
             }
         },

UI/Settings/Quality/Profile/DeleteView.js

@@ -17,7 +17,7 @@ define(
                 this.model.destroy({
                     wait: true
                 }).done(function () {
-                        App.modalRegion.closeModal();
+                        App.vent.trigger(App.Commands.CloseModalCommand);
                     });
             }
         });

UI/Settings/Quality/Profile/EditQualityProfileView.js

@@ -63,7 +63,7 @@ define(['app', 'marionette', 'Mixins/AsModelBoundView'], function (App, Marionet
             if (promise) {
                 promise.done(function () {
                     self.profileCollection.add(self.model, { merge: true });
-                    App.modalRegion.closeModal();
+                    App.vent.trigger(App.Commands.CloseModalCommand);
                 });
             }
         }

UI/Shared/Modal/Controller.js

@@ -0,0 +1,42 @@
+'use strict';
+define(
+    [
+        'app',
+        'marionette',
+        'Series/Edit/EditSeriesView',
+        'Series/Delete/DeleteSeriesView',
+        'Episode/Layout'
+
+    ], function (App, Marionette, EditSeriesView, DeleteSeriesView, EpisodeLayout) {
+
+        var router = Marionette.AppRouter.extend({
+
+            initialize: function () {
+                App.vent.on(App.Commands.CloseModalCommand, this._closeModal, this);
+                App.vent.on(App.Commands.EditSeriesCommand, this._editSeries, this);
+                App.vent.on(App.Commands.DeleteSeriesCommand, this._deleteSeries, this);
+                App.vent.on(App.Commands.ShowEpisodeDetails, this._showEpisode, this);
+            },
+
+            _closeModal: function () {
+                App.vent.trigger(App.Commands.CloseModalCommand);
+            },
+
+            _editSeries: function (options) {
+                var view = new EditSeriesView({ model: options.model });
+                App.modalRegion.show(view);
+            },
+
+            _deleteSeries: function (options) {
+                var view = new DeleteSeriesView({ model: options.model });
+                App.modalRegion.show(view);
+            },
+
+            _showEpisode: function (options) {
+                var view = new EpisodeLayout({ model: options.model });
+                App.modalRegion.show(view);
+            }
+        });
+
+        return new router();
+    });

UI/Shared/Modal/Region.js

@@ -39,11 +39,17 @@ define(
 
         });
 
+        require(
+            [
+                'Shared/Modal/Controller'
+            ], function () {
+
                 app.addInitializer(function () {
                     app.addRegions({
                         modalRegion: region
                     });
                 });
+            });
 
         return region;
     });

UI/app.js

@@ -175,6 +175,10 @@ define(
         };
 
         app.Commands = {
+            EditSeriesCommand  : 'EditSeriesCommand',
+            DeleteSeriesCommand: 'DeleteSeriesCommand',
+            CloseModalCommand  : 'CloseModalCommand',
+            ShowEpisodeDetails : 'ShowEpisodeDetails',
             SaveSettings       : 'saveSettings'
         };