From ed4bf349db8c724ab6e784420e1508799a596cb6 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 2 Feb 2015 23:01:45 -0800 Subject: [PATCH] Fixed webpack issues adding indexers/download clients/notifications --- src/UI/AddSeries/SearchResultView.js | 2 +- .../DownloadClient/Edit/DownloadClientEditView.js | 10 ++++------ src/UI/Settings/Indexers/Add/IndexerAddItemView.js | 8 +++++--- src/UI/Settings/Indexers/Edit/IndexerEditView.js | 9 ++++----- .../Notifications/Edit/NotificationEditView.js | 10 +++------- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/UI/AddSeries/SearchResultView.js b/src/UI/AddSeries/SearchResultView.js index e8c2376f7..35d308377 100644 --- a/src/UI/AddSeries/SearchResultView.js +++ b/src/UI/AddSeries/SearchResultView.js @@ -224,7 +224,7 @@ define( SeriesCollection.add(self.model); self.close(); - + Messenger.show({ message: 'Added: ' + self.model.get('title'), actions : { diff --git a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js index 7d930a5a6..d8ab8c1a5 100644 --- a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js +++ b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js @@ -1,16 +1,12 @@ -var _ = require('underscore'); -var vent = require('../../../vent'); -var AppLayout = require('../../../AppLayout'); +var vent = require('../../../vent'); var Marionette = require('marionette'); var DeleteView = require('../Delete/DownloadClientDeleteView'); -var CommandController = require('../../../Commands/CommandController'); var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); var AsValidatedView = require('../../../Mixins/AsValidatedView'); var AsEditModalView = require('../../../Mixins/AsEditModalView'); require('../../../Form/FormBuilder'); require('../../../Mixins/FileBrowser'); require('bootstrap'); -require('../Add/DownloadClientSchemaModal'); module.exports = (function(){ var view = Marionette.ItemView.extend({ @@ -19,7 +15,9 @@ module.exports = (function(){ path : '.x-path', modalBody : '.modal-body' }, - events : {"click .x-back" : '_back'}, + events : { + 'click .x-back' : '_back' + }, _deleteView : DeleteView, initialize : function(options){ this.targetCollection = options.targetCollection; diff --git a/src/UI/Settings/Indexers/Add/IndexerAddItemView.js b/src/UI/Settings/Indexers/Add/IndexerAddItemView.js index 5a9ee0f0c..c26a095cc 100644 --- a/src/UI/Settings/Indexers/Add/IndexerAddItemView.js +++ b/src/UI/Settings/Indexers/Add/IndexerAddItemView.js @@ -1,4 +1,4 @@ -var _ = require('underscore'); +var _ = require('underscore'); var $ = require('jquery'); var AppLayout = require('../../../AppLayout'); var Marionette = require('marionette'); @@ -8,9 +8,10 @@ module.exports = Marionette.ItemView.extend({ template : 'Settings/Indexers/Add/IndexerAddItemViewTemplate', tagName : 'li', className : 'add-thingy-item', + events : { - "click .x-preset" : '_addPreset', - "click" : '_add' + 'click .x-preset' : '_addPreset', + 'click' : '_add' }, initialize : function(options){ this.targetCollection = options.targetCollection; @@ -33,6 +34,7 @@ module.exports = Marionette.ItemView.extend({ enableRss : this.model.get('supportsRss'), enableSearch : this.model.get('supportsSearch') }); + var editView = new EditView({ model : this.model, targetCollection : this.targetCollection diff --git a/src/UI/Settings/Indexers/Edit/IndexerEditView.js b/src/UI/Settings/Indexers/Edit/IndexerEditView.js index b56a7ecfc..b1dfaa8a5 100644 --- a/src/UI/Settings/Indexers/Edit/IndexerEditView.js +++ b/src/UI/Settings/Indexers/Edit/IndexerEditView.js @@ -1,20 +1,19 @@ -var vent = require('../../../vent'); -var AppLayout = require('../../../AppLayout'); +var vent = require('../../../vent'); var Marionette = require('marionette'); var DeleteView = require('../Delete/IndexerDeleteView'); -var CommandController = require('../../../Commands/CommandController'); var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); var AsValidatedView = require('../../../Mixins/AsValidatedView'); var AsEditModalView = require('../../../Mixins/AsEditModalView'); require('../../../Form/FormBuilder'); require('../../../Mixins/AutoComplete'); require('bootstrap'); -require('../Add/IndexerSchemaModal'); module.exports = (function(){ var view = Marionette.ItemView.extend({ template : 'Settings/Indexers/Edit/IndexerEditViewTemplate', - events : {"click .x-back" : '_back'}, + events : { + 'click .x-back' : '_back' + }, _deleteView : DeleteView, initialize : function(options){ this.targetCollection = options.targetCollection; diff --git a/src/UI/Settings/Notifications/Edit/NotificationEditView.js b/src/UI/Settings/Notifications/Edit/NotificationEditView.js index cc88690f3..c0fe2f589 100644 --- a/src/UI/Settings/Notifications/Edit/NotificationEditView.js +++ b/src/UI/Settings/Notifications/Edit/NotificationEditView.js @@ -1,15 +1,11 @@ -var _ = require('underscore'); -var vent = require('../../../vent'); -var AppLayout = require('../../../AppLayout'); +var vent = require('../../../vent'); var Marionette = require('marionette'); var DeleteView = require('../Delete/NotificationDeleteView'); -var CommandController = require('../../../Commands/CommandController'); var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); var AsValidatedView = require('../../../Mixins/AsValidatedView'); var AsEditModalView = require('../../../Mixins/AsEditModalView'); require('../../../Form/FormBuilder'); require('../../../Mixins/TagInput'); -require('../Add/NotificationSchemaModal'); module.exports = (function(){ var view = Marionette.ItemView.extend({ @@ -20,8 +16,8 @@ module.exports = (function(){ tags : '.x-tags' }, events : { - "click .x-back" : '_back', - "change .x-on-download" : '_onDownloadChanged' + 'click .x-back' : '_back', + 'change .x-on-download' : '_onDownloadChanged' }, _deleteView : DeleteView, initialize : function(options){