diff --git a/Gruntfile.js b/Gruntfile.js index 719ca05e6..7cfd3b47c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -115,6 +115,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-wrap'); // Default task(s). grunt.registerTask('default', ['copy','less:bootstrap','handlebars', 'watch']); diff --git a/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js b/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js index 3e1d126b4..dd3a029fc 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js +++ b/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js @@ -1,135 +1,134 @@ 'use strict'; - define([ 'app', 'AddSeries/RootFolders/RootFolderCollection', 'Quality/QualityProfileCollection', 'Shared/NotificationCollection', 'AddSeries/Existing/UnmappedFolderModel', 'AddSeries/SearchResultCollection', 'Series/SeriesModel'], function (app, rootFolders, qualityProfileCollection, notificationCollection) { - NzbDrone.AddSeries.Existing.FolderMatchResultView = Backbone.Marionette.ItemView.extend({ - template:'AddSeries/Existing/FolderMatchResultViewTemplatate', + NzbDrone.AddSeries.Existing.FolderMatchResultView = Backbone.Marionette.ItemView.extend({ + template: 'AddSeries/Existing/FolderMatchResultViewTemplatate', - events:{ - 'click .x-btn-add':'addSeries' - }, + events: { + 'click .x-btn-add': 'addSeries' + }, - addSeries:function () { + addSeries: function () { - var self = this; + var self = this; - var seriesId = this.model.get('tvDbId'); - var title = this.model.get('title'); - var quality = this.options.qualityProfile.val(); - var path = this.options.folder.path; + var seriesId = this.model.get('tvDbId'); + var title = this.model.get('title'); + var quality = this.options.qualityProfile.val(); + var path = this.options.folder.path; - var model = new NzbDrone.Series.SeriesModel({ - tvDbId: seriesId, - title:title, - qualityProfileId:quality, - path:path - }); + var model = new NzbDrone.Series.SeriesModel({ + tvDbId : seriesId, + title : title, + qualityProfileId: quality, + path : path + }); - var seriesCollection = new NzbDrone.Series.SeriesCollection(); - seriesCollection.add(model); + var seriesCollection = new NzbDrone.Series.SeriesCollection(); + seriesCollection.add(model); - model.save(undefined, { - success:function () { - var notificationModel = new NzbDrone.Shared.NotificationModel({ - tvDbId: seriesId, - title:'Added', - message:title, - level:'success' - }); + model.save(undefined, { + success: function () { + var notificationModel = new NzbDrone.Shared.NotificationModel({ + tvDbId : seriesId, + title : 'Added', + message: title, + level : 'success' + }); - notificationCollection.push(notificationModel); - self.close(); - } - }); - } - - }); - - NzbDrone.AddSeries.Existing.UnmappedFolderCompositeView = Backbone.Marionette.CompositeView.extend({ - - template:'AddSeries/Existing/UnmappedFolderCompositeViewTemplatate', - itemViewContainer:'.x-folder-name-match-results', - itemView:NzbDrone.AddSeries.Existing.FolderMatchResultView, - - events:{ - 'click .x-btn-search':'search' - }, - - ui:{ - searchButton:'.x-btn-search', - searchText:'.x-txt-search', - profileList:'.x-lst-quality-profile' - }, - - initialize:function () { - this.collection = new NzbDrone.AddSeries.SearchResultCollection(); - }, - - search:function () { - - var icon = this.ui.searchButton.find('icon'); - - icon.removeClass('icon-search').addClass('icon-spin icon-spinner disabled'); - - this.collection.fetch({ - data:{ term:this.ui.searchText.val() }, - success:function () { - icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search'); - - }, - fail:function () { - icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search'); - } - }); - }, - - itemViewOptions:function () { - return { - qualityProfile:this.ui.profileList, - rootFolder: this.model.get('rootFolder'), - folder: this.model.get('folder') - }; - } - - - - }); - - NzbDrone.AddSeries.Existing.RootFolderCompositeView = Backbone.Marionette.CompositeView.extend({ - - template:"AddSeries/Existing/RootFolderCompositeViewTemplate", - itemViewContainer:".x-existing-folder-container", - itemView:NzbDrone.AddSeries.Existing.UnmappedFolderCompositeView, - - initialize:function () { - - if (!this.model) { - throw "model is required."; + notificationCollection.push(notificationModel); + self.close(); } + }); + } - this.collection = new NzbDrone.AddSeries.Existing.UnmappedFolderCollection(); - this.refreshItems(); - this.listenTo(qualityProfileCollection, 'reset', this.refreshItems, this); - }, - - refreshItems:function () { - this.collection.importItems(this.model); - } - - - - }); - - NzbDrone.AddSeries.Existing.ImportSeriesView = Backbone.Marionette.CollectionView.extend({ - - itemView:NzbDrone.AddSeries.Existing.RootFolderCompositeView, - - initialize:function () { - this.collection = rootFolders; - } - - }); }); + + NzbDrone.AddSeries.Existing.UnmappedFolderCompositeView = Backbone.Marionette.CompositeView.extend({ + + template : 'AddSeries/Existing/UnmappedFolderCompositeViewTemplatate', + itemViewContainer: '.x-folder-name-match-results', + itemView : NzbDrone.AddSeries.Existing.FolderMatchResultView, + + events: { + 'click .x-btn-search': 'search' + }, + + ui: { + searchButton: '.x-btn-search', + searchText : '.x-txt-search', + profileList : '.x-lst-quality-profile' + }, + + initialize: function () { + this.collection = new NzbDrone.AddSeries.SearchResultCollection(); + }, + + search: function () { + + var icon = this.ui.searchButton.find('icon'); + + icon.removeClass('icon-search').addClass('icon-spin icon-spinner disabled'); + + this.collection.fetch({ + data : { term: this.ui.searchText.val() }, + success: function () { + icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search'); + + }, + fail : function () { + icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search'); + } + }); + }, + + itemViewOptions: function () { + return { + qualityProfile: this.ui.profileList, + rootFolder : this.model.get('rootFolder'), + folder : this.model.get('folder') + }; + } + + + + }); + + NzbDrone.AddSeries.Existing.RootFolderCompositeView = Backbone.Marionette.CompositeView.extend({ + + template : "AddSeries/Existing/RootFolderCompositeViewTemplate", + itemViewContainer: ".x-existing-folder-container", + itemView : NzbDrone.AddSeries.Existing.UnmappedFolderCompositeView, + + initialize: function () { + + if (!this.model) { + throw "model is required."; + } + + this.collection = new NzbDrone.AddSeries.Existing.UnmappedFolderCollection(); + this.refreshItems(); + this.listenTo(qualityProfileCollection, 'reset', this.refreshItems, this); + }, + + refreshItems: function () { + this.collection.importItems(this.model); + } + + + + }); + + NzbDrone.AddSeries.Existing.ImportSeriesView = Backbone.Marionette.CollectionView.extend({ + + itemView: NzbDrone.AddSeries.Existing.RootFolderCompositeView, + + initialize: function () { + this.collection = rootFolders; + } + + }); +}); diff --git a/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderModel.js b/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderModel.js index 449024dcf..d6719d6ee 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderModel.js +++ b/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderModel.js @@ -1,11 +1,10 @@ 'use strict'; - -define(['app','Quality/QualityProfileCollection'], function (app, qualityProfiles) { +define(['app', 'Quality/QualityProfileCollection'], function (app, qualityProfiles) { NzbDrone.AddSeries.Existing.UnmappedFolderModel = Backbone.Model.extend({ - defaults :{ + defaults: { quality: qualityProfiles } diff --git a/NzbDrone.Backbone/AddSeries/New/AddNewSeriesView.js b/NzbDrone.Backbone/AddSeries/New/AddNewSeriesView.js index 09bed9258..cde93a822 100644 --- a/NzbDrone.Backbone/AddSeries/New/AddNewSeriesView.js +++ b/NzbDrone.Backbone/AddSeries/New/AddNewSeriesView.js @@ -1,4 +1,5 @@ -define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'AddSeries/New/SearchResultView', 'Shared/SpinnerView'], function () { +"use strict"; +define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'AddSeries/New/SearchResultView', 'Shared/SpinnerView'], function () { NzbDrone.AddSeries.New.AddNewSeriesView = Backbone.Marionette.Layout.extend({ template: 'AddSeries/New/AddNewSeriesTemplate', route: 'Series/add/new', diff --git a/NzbDrone.Backbone/AddSeries/New/SearchResultView.js b/NzbDrone.Backbone/AddSeries/New/SearchResultView.js index 6111022d8..3cafb5daf 100644 --- a/NzbDrone.Backbone/AddSeries/New/SearchResultView.js +++ b/NzbDrone.Backbone/AddSeries/New/SearchResultView.js @@ -1,5 +1,4 @@ 'use strict'; - define(['app', 'Shared/NotificationCollection', 'AddSeries/SearchResultCollection', 'AddSeries/SearchResultModel', 'Series/SeriesCollection'], function (app, notificationCollection) { NzbDrone.AddSeries.New.SearchItemView = Backbone.Marionette.ItemView.extend({ diff --git a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderCollection.js b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderCollection.js index 470d6120f..c734a5257 100644 --- a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderCollection.js +++ b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderCollection.js @@ -1,4 +1,5 @@ -define(['app', 'AddSeries/RootFolders/RootFolderModel'], function () { +"use strict"; +define(['app', 'AddSeries/RootFolders/RootFolderModel'], function () { var rootFolderCollection = Backbone.Collection.extend({ url: NzbDrone.Constants.ApiRoot + '/rootfolder', diff --git a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderModel.js b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderModel.js index 13e284c17..282011998 100644 --- a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderModel.js +++ b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderModel.js @@ -1,3 +1,4 @@ +"use strict"; define(['app'], function () { NzbDrone.AddSeries.RootFolders.RootFolderModel = Backbone.Model.extend({ mutators: { diff --git a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js index e2f50f53f..b3f976e78 100644 --- a/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js +++ b/NzbDrone.Backbone/AddSeries/RootFolders/RootFolderView.js @@ -1,8 +1,7 @@ -'use strict;' +"use strict"; define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Mixins/AutoComplete'], function (app,rootFolders) { - NzbDrone.AddSeries.RootFolderItemView = Backbone.Marionette.ItemView.extend({ template: 'AddSeries/RootFolders/RootFolderItemTemplate', diff --git a/package.json b/package.json index d72995ada..954158a42 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "grunt-contrib-less": "*", "grunt-contrib-concat": "*", "grunt-contrib-copy": "*", + "grunt-wrap": "*", "grunt-curl": "*" } }