Merge branch 'evented-modals' into vnext

Conflicts:
	UI/Calendar/CalendarView.js
	UI/Series/Edit/EditSeriesView.js
	UI/Shared/Modal/Controller.js

UI/Calendar/CalendarView.js

@@ -7,7 +7,7 @@ define(
         'moment',
         'Calendar/Collection',
         'fullcalendar'
-    ], function (App, Marionette, Moment, CalendarCollection, EpisodeLayout) {
+    ], function (App, Marionette, Moment, CalendarCollection) {
 
         var _instance;
 
@@ -37,8 +37,7 @@ define(
                         $(element).children('.fc-event-inner').addClass(event.statusLevel);
                     },
                     eventClick    : function (event) {
-                        var view = new EpisodeLayout({ model: event.model });
+                        App.vent.trigger(App.Commands.ShowEpisodeDetails, {episode: event.model});
-                        App.modalRegion.show(view);
                     }
                 });
 

UI/Calendar/UpcomingItemView.js

@@ -3,20 +3,18 @@
 define(
     [
         'app',
-        'marionette',
+        'marionette'
-        'Episode/Layout'
+    ], function (App, Marionette) {
-    ], function (App, Marionette, EpisodeLayout) {
         return Marionette.ItemView.extend({
             template: 'Calendar/UpcomingItemTemplate',
             tagName : 'div',
 
-            events  : {
+            events: {
-                'click .x-episode-title' : '_showEpisodeDetails'
+                'click .x-episode-title': '_showEpisodeDetails'
             },
 
-            _showEpisodeDetails : function() {
+            _showEpisodeDetails: function () {
-                var view = new EpisodeLayout({ model: this.model });
+                App.vent.trigger(App.Commands.ShowEpisodeDetails, {episode: this.model});
-                App.modalRegion.show(view);
             }
         });
     });

UI/Cells/EpisodeTitleCell.js

@@ -3,9 +3,8 @@
 define(
     [
         'app',
-        'Cells/NzbDroneCell',
+        'Cells/NzbDroneCell'
-        'Episode/Layout'
+    ], function (App, NzbDroneCell) {
-    ], function (App, NzbDroneCell, EpisodeLayout) {
         return NzbDroneCell.extend({
 
             className: 'episode-title-cell',
@@ -15,8 +14,7 @@ define(
             },
 
             showDetails: function () {
-                var view = new EpisodeLayout({ model: this.cellValue });
+                App.vent.trigger(App.Commands.ShowEpisodeDetails, {episode: this.cellValue});
-                App.modalRegion.show(view);
             },
 
             render: function () {

UI/Series/Delete/DeleteSeriesTemplate.html

@@ -1,6 +1,6 @@
 <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3>Delete: {{title}}</h3>
+    <h3>Delete {{title}}</h3>
 </div>
 <div class="modal-body delete-series-modal">
 

UI/Series/Edit/EditSeriesTemplate.html

@@ -1,11 +1,12 @@
 <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3>Edit: {{title}}</h3>
+    <h3>{{title}}</h3>
 </div>
 <div class="modal-body edit-series-modal">
     <div class="row">
         <div class="span2">
-            <img class="series-poster" src="{{poster}}" {{defaultImg}}>
+            <img class="series-poster" src="{{poster}}"
+            {{defaultImg}}>
         </div>
         <div class="span7">
             <div class="form-horizontal">
@@ -76,17 +77,6 @@
                 </span>
                     </div>
                 </div>
-
-                <div class="control-group">
-                    <label class="control-label" for="inputCustomStartDate">Custom Start Date</label>
-
-                    <div class="controls">
-                        <input type="date" id="inputCustomStartDate" name="customStartDate">
-                <span class="help-inline">
-                    <i class="icon-question-sign" title="Should NzbDrone only download episodes after your preferred start date?"/>
-                </span>
-                    </div>
-                </div>
             </div>
         </div>
     </div>

UI/Series/Edit/EditSeriesView.js

@@ -3,11 +3,10 @@ define(
     [
         'app',
         'marionette',
-        'Series/Delete/DeleteSeriesView',
         'Quality/QualityProfileCollection',
         'Mixins/AsModelBoundView',
         'Mixins/AutoComplete'
-    ], function (App, Marionette, DeleteSeriesView, QualityProfiles, AsModelBoundView) {
+    ], function (App, Marionette, QualityProfiles, AsModelBoundView) {
 
         var view = Marionette.ItemView.extend({
             template: 'Series/Edit/EditSeriesTemplate',
@@ -45,8 +44,7 @@ define(
             },
 
             _removeSeries: function () {
-                var view = new DeleteSeriesView({ model: this.model });
+                App.vent.trigger(App.Commands.DeleteSeriesCommand, {series:this.model});
-                App.modalRegion.show(view);
             }
         });
 

UI/Series/Index/List/ItemView.js

@@ -4,10 +4,7 @@ define(
     [
         'app',
         'marionette',
-        'Series/Edit/EditSeriesView',
+    ], function (App, Marionette) {
-        'Series/Delete/DeleteSeriesView'
-
-    ], function (App, Marionette, EditSeriesView, DeleteSeriesView) {
         return Marionette.ItemView.extend({
             template: 'Series/Index/List/ItemTemplate',
 
@@ -21,13 +18,11 @@ define(
             },
 
             editSeries: function () {
-                var view = new EditSeriesView({ model: this.model});
+                App.vent.trigger(App.Commands.EditSeriesCommand, {series: this.model});
-                App.modalRegion.show(view);
             },
 
             removeSeries: function () {
-                var view = new DeleteSeriesView({ model: this.model });
+                App.vent.trigger(App.Commands.DeleteSeriesCommand, {series: this.model});
-                App.modalRegion.show(view);
             }
         });
     });

UI/Series/Index/Posters/ItemView.js

@@ -3,11 +3,8 @@
 define(
     [
         'app',
-        'marionette',
+        'marionette'
-        'Series/Edit/EditSeriesView',
+    ], function (App, Marionette) {
-        'Series/Delete/DeleteSeriesView'
-
-    ], function (App, Marionette, EditSeriesView, DeleteSeriesView) {
 
         return Marionette.ItemView.extend({
             tagName : 'li',
@@ -28,13 +25,11 @@ define(
 
 
             editSeries: function () {
-                var view = new EditSeriesView({ model: this.model});
+                App.vent.trigger(App.Commands.EditSeriesCommand, {series:this.model});
-                App.modalRegion.show(view);
             },
 
             removeSeries: function () {
-                var view = new DeleteSeriesView({ model: this.model });
+                App.vent.trigger(App.Commands.DeleteSeriesCommand, {series:this.model});
-                App.modalRegion.show(view);
             },
 
             posterHoverAction: function () {

UI/Series/Index/Table/Row.js

@@ -2,10 +2,8 @@
 define(
     [
         'app',
-        'backgrid',
+        'backgrid'
-        'Series/Edit/EditSeriesView',
+    ], function (App, Backgrid) {
-        'Series/Delete/DeleteSeriesView'
-    ], function (App, Backgrid, EditSeriesView, DeleteSeriesView) {
         return Backgrid.Row.extend({
             events: {
                 'click .x-edit'  : 'editSeries',
@@ -13,14 +11,12 @@ define(
             },
 
             editSeries: function () {
-                var view = new EditSeriesView({ model: this.model});
+                App.vent.trigger(App.Commands.EditSeriesCommand, {series:this.model});
-                App.modalRegion.show(view);
             },
 
             removeSeries: function () {
-                var view = new DeleteSeriesView({ model: this.model });
+                App.vent.trigger(App.Commands.DeleteSeriesCommand, {series:this.model});
-                App.modalRegion.show(view);
+            },
-            }
         });
     });
 

UI/Series/series.less

@@ -6,7 +6,7 @@
   overflow : visible;
 
   .series-poster {
-    .card;
+    padding-left: 20px;
     width : 168px;
   }
 

UI/Shared/Modal/Controller.js

@@ -19,21 +19,21 @@ define(
             },
 
             _closeModal: function () {
-                App.vent.trigger(App.Commands.CloseModalCommand);
+                App.modalRegion.closeModal();
             },
 
             _editSeries: function (options) {
-                var view = new EditSeriesView({ model: options.model });
+                var view = new EditSeriesView({ model: options.series });
                 App.modalRegion.show(view);
             },
 
             _deleteSeries: function (options) {
-                var view = new DeleteSeriesView({ model: options.model });
+                var view = new DeleteSeriesView({ model: options.series });
                 App.modalRegion.show(view);
             },
 
             _showEpisode: function (options) {
-                var view = new EpisodeLayout({ model: options.model });
+                var view = new EpisodeLayout({ model: options.episode });
                 App.modalRegion.show(view);
             }
         });