diff --git a/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs b/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs index 190ba9d3c..496a1ed18 100644 --- a/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs +++ b/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs @@ -7,6 +7,7 @@ using NzbDrone.Common.EnsureThat; using NzbDrone.Common.Extensions; using NzbDrone.Common.Reflection; using NzbDrone.Core.Annotations; +using NzbDrone.Core.Download.Clients.Nzbget; using NzbDrone.Core.Qualities; using NzbDrone.Core.Profiles; @@ -181,6 +182,11 @@ namespace NzbDrone.Api.ClientSchema var options = from Enum e in Enum.GetValues(selectOptions) select new SelectOption { Value = Convert.ToInt32(e), Name = e.ToString() }; + if (selectOptions == typeof(NzbgetPriority)) + { + return options.OrderBy(o => o.Value).ToList(); + } + return options.OrderBy(o => o.Name).ToList(); } } diff --git a/src/UI/AddMovies/AddMoviesView.js b/src/UI/AddMovies/AddMoviesView.js index b10c597b5..a0fd6d5fb 100644 --- a/src/UI/AddMovies/AddMoviesView.js +++ b/src/UI/AddMovies/AddMoviesView.js @@ -231,7 +231,6 @@ module.exports = Marionette.Layout.extend({ this.listsDropdown = new DiscoverableListDropdownView(DiscoverableListCollection.toJSON()); this.listsDropdown.render(); $("#list-dropdown").html(this.listsDropdown.$el.html()); - //debugger; //this.myRegion.show(new DiscoverableListDropdownView(DiscoverableListCollection.toJSON())); }, diff --git a/src/UI/AddMovies/BulkImport/BulkImportProfileCell.js b/src/UI/AddMovies/BulkImport/BulkImportProfileCell.js index 353b4f54e..0c760e56c 100644 --- a/src/UI/AddMovies/BulkImport/BulkImportProfileCell.js +++ b/src/UI/AddMovies/BulkImport/BulkImportProfileCell.js @@ -25,7 +25,6 @@ module.exports = Backgrid.SelectCell.extend({ }, optionValues : function() { - //debugger; return _.map(ProfileCollection.models, function(model){ return [model.get("name"), model.get("id")+""]; }); diff --git a/src/UI/AddMovies/BulkImport/BulkImportView.js b/src/UI/AddMovies/BulkImport/BulkImportView.js index cea241475..80434c0ad 100644 --- a/src/UI/AddMovies/BulkImport/BulkImportView.js +++ b/src/UI/AddMovies/BulkImport/BulkImportView.js @@ -56,7 +56,6 @@ module.exports = Marionette.Layout.extend({ this.bulkImportCollection.fullCollection.reset(); this.bulkImportCollection.reset(); this.table.show(new LoadingView()); - //debugger; this.bulkImportCollection.setPageSize(pageSize); //this.bulkImportCollection.fetch(); }, diff --git a/src/UI/AddMovies/SearchResultCollectionView.js b/src/UI/AddMovies/SearchResultCollectionView.js index a270ad35c..acb807499 100644 --- a/src/UI/AddMovies/SearchResultCollectionView.js +++ b/src/UI/AddMovies/SearchResultCollectionView.js @@ -39,7 +39,6 @@ module.exports = Marionette.CollectionView.extend({ setExisting : function(tmdbid) { var movies = this.collection.where({ tmdbId : tmdbid }); console.warn(movies); - //debugger; if (movies.length > 0) { this.children.findByModel(movies[0])._configureTemplateHelpers(); //this.children.findByModel(movies[0])._configureTemplateHelpers(); diff --git a/src/UI/Cells/Edit/QualityCellEditor.js b/src/UI/Cells/Edit/QualityCellEditor.js index 564c9b0ea..40d26c555 100644 --- a/src/UI/Cells/Edit/QualityCellEditor.js +++ b/src/UI/Cells/Edit/QualityCellEditor.js @@ -23,7 +23,6 @@ module.exports = Backgrid.CellEditor.extend({ promise.done(function() { var templateName = self.template; self.schema = profileSchemaCollection.first(); - debugger; var selected = _.find(self.schema.get('items'), function(model) { return model.quality.id === self.model.get(self.column.get('name')).quality.id; diff --git a/src/UI/JsLibraries/backbone.backgrid.js b/src/UI/JsLibraries/backbone.backgrid.js index b8c2157e4..6cd3093ad 100644 --- a/src/UI/JsLibraries/backbone.backgrid.js +++ b/src/UI/JsLibraries/backbone.backgrid.js @@ -2404,7 +2404,6 @@ var Body = Backgrid.Body = Backbone.View.extend({ See [Backbone.Collection#comparator](http://backbonejs.org/#Collection-comparator) */ sort: function (column, direction) { - //debugger; if (_.isString(column)) column = this.columns.findWhere({name: column}); var collection = this.collection; diff --git a/src/UI/JsLibraries/backbone.js b/src/UI/JsLibraries/backbone.js index 7941ab684..70a854d31 100644 --- a/src/UI/JsLibraries/backbone.js +++ b/src/UI/JsLibraries/backbone.js @@ -815,7 +815,7 @@ sort: function(options) { if (!this.comparator) throw new Error('Cannot sort a set without a comparator'); options || (options = {}); - //debugger; + // Run sort based on type of `comparator`. if (_.isString(this.comparator) || this.comparator.length === 1) { this.models = this.sortBy(this.comparator, this); diff --git a/src/UI/ManualImport/Movie/SelectMovieLayout.js b/src/UI/ManualImport/Movie/SelectMovieLayout.js index 5de935741..e970debf6 100644 --- a/src/UI/ManualImport/Movie/SelectMovieLayout.js +++ b/src/UI/ManualImport/Movie/SelectMovieLayout.js @@ -87,7 +87,7 @@ module.exports = Marionette.Layout.extend({ _filter : function (term) { this.movieCollection.reset(this.fullMovieCollection.filter(function(model){ - return (model.get("title") + " "+model.get("year")+"").toLowerCase().indexOf(term.toLowerCase()) != -1; + return (model.get("title") + " "+model.get("year")+"").toLowerCase().indexOf(term.toLowerCase()) !== -1; }).slice(0, 50)); this._setModelCollection(); @@ -95,7 +95,6 @@ module.exports = Marionette.Layout.extend({ }, _onSelected : function (e) { - debugger; this.trigger('manualimport:selected:movie', { model: e.model }); vent.trigger(vent.Commands.CloseModal2Command); diff --git a/src/UI/ManualImport/Quality/SelectQualityView.js b/src/UI/ManualImport/Quality/SelectQualityView.js index 2e864fdd4..44454e1eb 100644 --- a/src/UI/ManualImport/Quality/SelectQualityView.js +++ b/src/UI/ManualImport/Quality/SelectQualityView.js @@ -26,10 +26,10 @@ module.exports = Marionette.ItemView.extend({ }, onRender : function() { - if (this.current.formats != undefined) { + if (this.current.formats !== undefined) { this.ui.formats.val(this.current.formats.map(function(m) {return m.id;}).join(",")); } - if (this.current.quality != undefined) { + if (this.current.quality !== undefined) { this.ui.select.val(this.current.quality.id); } this.ui.formats.tagInput(); diff --git a/src/UI/Movies/Delete/DeleteMovieTemplate.hbs b/src/UI/Movies/Delete/DeleteMovieTemplate.hbs index bb765cd2f..2e668debe 100644 --- a/src/UI/Movies/Delete/DeleteMovieTemplate.hbs +++ b/src/UI/Movies/Delete/DeleteMovieTemplate.hbs @@ -3,7 +3,7 @@

Delete {{title}}

-
+
-
+
diff --git a/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs b/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs index c6cda6a8b..799b84a03 100644 --- a/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs +++ b/src/UI/Movies/Editor/Organize/OrganizeFilesViewTemplate.hbs @@ -11,8 +11,8 @@ Are you sure you want to update all files in the {{numberOfMovies}} selected movies? - -
    + +
      {{#each movies}}
    • {{title}}
      • {{/each}} diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 4da4e22c4..2dc1d3e32 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -145,7 +145,6 @@ module.exports = Marionette.Layout.extend({ initialize : function() { //this variable prevents us from showing the list before moviesCollection has been fetched the first time this.moviesCollection = MoviesCollection.clone(); - //debugger; this.moviesCollection.bindSignalR(); var pageSize = parseInt(Config.getValue("pageSize")) || 10; if (this.moviesCollection.state.pageSize !== pageSize) { @@ -321,7 +320,6 @@ module.exports = Marionette.Layout.extend({ }; //this._showToolbar(); - //debugger; var self = this; setTimeout(function(){self._showToolbar();}, 0); // jshint ignore:line //this._renderView(); @@ -397,7 +395,6 @@ module.exports = Marionette.Layout.extend({ }, _showToolbar : function() { - //debugger; if (this.toolbar.currentView) { return; } diff --git a/src/UI/Movies/MoviesController.js b/src/UI/Movies/MoviesController.js index c45e0c7b8..77da55971 100644 --- a/src/UI/Movies/MoviesController.js +++ b/src/UI/Movies/MoviesController.js @@ -26,7 +26,6 @@ module.exports = NzbDroneController.extend({ if(FullMovieCollection.length > 0) { this._renderMovieDetails(query); - //debugger; } else { var self = this; $.getJSON(window.NzbDrone.ApiRoot + '/movie/titleslug/'+query, { }, function(data) { @@ -34,7 +33,6 @@ module.exports = NzbDroneController.extend({ self._renderMovieDetails(query); }); this.listenTo(FullMovieCollection, 'sync', function(model, options) { - //debugger; this._renderMovieDetails(query); }); } diff --git a/src/UI/Movies/movies.less b/src/UI/Movies/movies.less index 47c7db7e2..2ca2818bf 100644 --- a/src/UI/Movies/movies.less +++ b/src/UI/Movies/movies.less @@ -156,7 +156,7 @@ width : 170px; :hover { - cursor : default; + cursor : pointer; } .label { diff --git a/src/UI/Settings/NetImport/Delete/IndexerDeleteView.js b/src/UI/Settings/NetImport/Delete/NetImportDeleteView.js similarity index 84% rename from src/UI/Settings/NetImport/Delete/IndexerDeleteView.js rename to src/UI/Settings/NetImport/Delete/NetImportDeleteView.js index 58e7e3eb5..f46355e16 100644 --- a/src/UI/Settings/NetImport/Delete/IndexerDeleteView.js +++ b/src/UI/Settings/NetImport/Delete/NetImportDeleteView.js @@ -2,7 +2,7 @@ var vent = require('vent'); var Marionette = require('marionette'); module.exports = Marionette.ItemView.extend({ - template : 'Settings/Indexers/Delete/IndexerDeleteViewTemplate', + template : 'Settings/NetImport/Delete/NetImportDeleteViewTemplate', events : { 'click .x-confirm-delete' : '_delete' @@ -16,4 +16,4 @@ module.exports = Marionette.ItemView.extend({ } }); } -}); \ No newline at end of file +}); diff --git a/src/UI/Settings/NetImport/Delete/IndexerDeleteViewTemplate.hbs b/src/UI/Settings/NetImport/Delete/NetImportDeleteViewTemplate.hbs similarity index 92% rename from src/UI/Settings/NetImport/Delete/IndexerDeleteViewTemplate.hbs rename to src/UI/Settings/NetImport/Delete/NetImportDeleteViewTemplate.hbs index c5c7ad7db..2b41112b7 100644 --- a/src/UI/Settings/NetImport/Delete/IndexerDeleteViewTemplate.hbs +++ b/src/UI/Settings/NetImport/Delete/NetImportDeleteViewTemplate.hbs @@ -1,7 +1,7 @@
      -

      Delete Indexer

      +

      Delete List

      Are you sure you want to delete '{{name}}'?

      @@ -10,4 +10,4 @@
      -
      \ No newline at end of file +
diff --git a/src/UI/Settings/NetImport/Edit/NetImportEditView.js b/src/UI/Settings/NetImport/Edit/NetImportEditView.js index a96d193c0..cd8490f37 100644 --- a/src/UI/Settings/NetImport/Edit/NetImportEditView.js +++ b/src/UI/Settings/NetImport/Edit/NetImportEditView.js @@ -3,7 +3,7 @@ var $ = require('jquery'); var vent = require('vent'); var AppLayout = require('../../../AppLayout'); var Marionette = require('marionette'); -var DeleteView = require('../Delete/IndexerDeleteView'); +var DeleteView = require('../Delete/NetImportDeleteView'); var Profiles = require('../../../Profile/ProfileCollection'); var AsModelBoundView = require('../../../Mixins/AsModelBoundView'); var AsValidatedView = require('../../../Mixins/AsValidatedView'); diff --git a/src/UI/Settings/Profile/Edit/EditProfileLayout.js b/src/UI/Settings/Profile/Edit/EditProfileLayout.js index 8e54a9493..e0aa1ab87 100644 --- a/src/UI/Settings/Profile/Edit/EditProfileLayout.js +++ b/src/UI/Settings/Profile/Edit/EditProfileLayout.js @@ -30,7 +30,7 @@ var view = Marionette.Layout.extend({ initialize : function(options) { this.profileCollection = options.profileCollection; this.itemsCollection = new Backbone.Collection(_.toArray(this.model.get('items')).reverse()); - this.netImportCollection = new NetImportCollection; + this.netImportCollection = new NetImportCollection(); this.netImportCollection.fetch(); this.formatItemsCollection = new Backbone.Collection(_.toArray(this.model.get('formatItems')).reverse()); this.listenTo(FullMovieCollection, 'all', this._updateDisableStatus); diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js b/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js index 298f446e0..562308781 100644 --- a/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js +++ b/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js @@ -94,7 +94,7 @@ var view = Marionette.ItemView.extend({ var input = this.ui.thirtyMinuteMaxSize.val(); var maxSize = parseFloat(input) || 0; var mbPerMinute = maxSize / 90 * 1024; - if (mbPerMinute == 0) + if (mbPerMinute === 0) { mbPerMinute = null; }