-
+
@@ -7,3 +7,6 @@
+
+ more
+
diff --git a/UI/AddSeries/AddSeriesView.js b/UI/AddSeries/AddSeriesView.js
index 018c973f0..33e28da0c 100644
--- a/UI/AddSeries/AddSeriesView.js
+++ b/UI/AddSeries/AddSeriesView.js
@@ -14,15 +14,18 @@ define(
template: 'AddSeries/AddSeriesTemplate',
ui: {
- seriesSearch: '.x-series-search'
+ seriesSearch: '.x-series-search',
+ searchBar : '.x-search-bar',
+ loadMore : '.x-load-more'
},
regions: {
searchResult: '#search-result'
},
- initialize: function () {
+ initialize: function (options) {
this.collection = new AddSeriesCollection();
+ this.isExisting = options.isExisting;
},
onRender: function () {
@@ -30,31 +33,45 @@ define(
this.ui.seriesSearch.data('timeout', null).keyup(function () {
window.clearTimeout(self.$el.data('timeout'));
- self.$el.data('timeout', window.setTimeout(self.search, 500, self));
+ self.$el.data('timeout', window.setTimeout(function () {
+ self.search.call(self, {
+ term: self.ui.seriesSearch.val()
+ });
+ }, 500));
});
- this.resultView = new SearchResultCollectionView({ collection: this.collection });
+ if (this.isExisting) {
+ this.ui.searchBar.hide();
+ }
+
+ this.resultView = new SearchResultCollectionView({
+ fullResult: this.collection,
+ isExisting: this.isExisting
+ });
},
- search: function (context) {
+ search: function (options) {
- context.abortExistingRequest();
+ var self = this;
- var term = context.ui.seriesSearch.val();
- context.collection.reset();
+ this.abortExistingRequest();
- if (term === '') {
- context.searchResult.close();
+ this.collection.reset();
+
+ if (!options || options.term === '') {
+ this.searchResult.close();
}
else {
- context.searchResult.show(new SpinnerView());
+ this.searchResult.show(new SpinnerView());
+ this.currentSearchRequest = this.collection.fetch({
+ data: { term: options.term }
+ }).done(function () {
+ self.searchResult.show(self.resultView);
- context.currentSearchRequest = context.collection.fetch({
- data : { term: term },
- success: function () {
- context.searchResult.show(context.resultView);
- }
- });
+ if (!self.showingAll && self.isExisting) {
+ self.ui.loadMore.show();
+ }
+ });
}
},
diff --git a/UI/AddSeries/Existing/CollectionView.js b/UI/AddSeries/Existing/CollectionView.js
index 7198bfb68..a933fe8f8 100644
--- a/UI/AddSeries/Existing/CollectionView.js
+++ b/UI/AddSeries/Existing/CollectionView.js
@@ -2,13 +2,13 @@
define(
[
'marionette',
- 'AddSeries/Existing/CompositeView',
+ 'AddSeries/AddSeriesView',
'AddSeries/Existing/UnmappedFolderCollection'
- ], function (Marionette, UnmappedFolderCompositeView, UnmappedFolderCollection) {
+ ], function (Marionette, AddSeriesView, UnmappedFolderCollection) {
return Marionette.CollectionView.extend({
- itemView: UnmappedFolderCompositeView,
+ itemView: AddSeriesView,
initialize: function () {
this.collection = new UnmappedFolderCollection();
@@ -26,14 +26,20 @@ define(
_showAndSearch: function (index) {
var model = this.collection.at(index);
+
if (model) {
var that = this;
var currentIndex = index;
+ var folderName = model.get('folder').name;
this.addItemView(model, this.getItemView(), index);
- $.when(this.children.findByModel(model).search()).then(function () {
+ $.when(this.children.findByModel(model).search({term: folderName})).then(function () {
that._showAndSearch(currentIndex + 1);
});
}
+ },
+
+ itemViewOptions: {
+ isExisting: true
}
});
diff --git a/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html b/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html
index cd94f27f9..bd4871a49 100644
--- a/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html
+++ b/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html
@@ -20,7 +20,5 @@
-
- more
-
+
diff --git a/UI/AddSeries/RootFolders/ItemView.js b/UI/AddSeries/RootFolders/ItemView.js
index 7636ebd45..9eb49ac65 100644
--- a/UI/AddSeries/RootFolders/ItemView.js
+++ b/UI/AddSeries/RootFolders/ItemView.js
@@ -17,7 +17,6 @@ define(
removeFolder: function () {
this.model.destroy({ wait: true });
- this.model.collection.remove(this.model);
},
folderSelected: function () {
diff --git a/UI/AddSeries/RootFolders/RootFolderItemTemplate.html b/UI/AddSeries/RootFolders/RootFolderItemTemplate.html
index f3f438c63..fc35d24c8 100644
--- a/UI/AddSeries/RootFolders/RootFolderItemTemplate.html
+++ b/UI/AddSeries/RootFolders/RootFolderItemTemplate.html
@@ -1,6 +1,8 @@
-
|
+
+ {{path}}
+ |
-
+ {{freeSpaceString}}
|
diff --git a/UI/AddSeries/SearchResultCollectionView.js b/UI/AddSeries/SearchResultCollectionView.js
index 986ba60c6..1cad1f138 100644
--- a/UI/AddSeries/SearchResultCollectionView.js
+++ b/UI/AddSeries/SearchResultCollectionView.js
@@ -2,15 +2,45 @@
define(
[
'marionette',
- 'AddSeries/SearchResultView'
- ], function (Marionette, SearchResultView) {
+ 'AddSeries/SearchResultView',
+ 'AddSeries/Collection'
+
+ ], function (Marionette, SearchResultView, SearchResultCollection) {
return Marionette.CollectionView.extend({
- itemView : SearchResultView,
- initialize: function () {
- this.listenTo(this.collection, 'reset', this.render);
+ itemView: SearchResultView,
+
+ initialize: function (options) {
+
+
+ this.isExisting = options.isExisting;
+ this.fullResult = options.fullResult;
+
+ this.listenTo(this.fullResult, 'sync', this._processResultCollection);
+ },
+
+
+ showAll: function () {
+
+ this.showingAll = true;
+ this.fullResult.each(function (searchResult) {
+ this.collection.add(searchResult);
+ });
+
+ this.render();
+ },
+
+ _processResultCollection: function () {
+ if (!this.showingAll && this.isExisting) {
+ this.collection = new SearchResultCollection();
+ this.collection.add(this.fullResult.shift());
+ }
+ else {
+ this.collection = this.fullResult;
+ }
}
+
});
});
diff --git a/UI/Series/Delete/DeleteSeriesView.js b/UI/Series/Delete/DeleteSeriesView.js
index 6d61a42fe..2def43b38 100644
--- a/UI/Series/Delete/DeleteSeriesView.js
+++ b/UI/Series/Delete/DeleteSeriesView.js
@@ -1,34 +1,34 @@
'use strict';
-define(['app', 'Series/SeriesModel'], function () {
+define(
+ [
+ 'app',
+ 'Series/SeriesModel'
+ ], function () {
- NzbDrone.Series.Delete.DeleteSeriesView = Backbone.Marionette.ItemView.extend({
- template: 'Series/Delete/DeleteSeriesTemplate',
+ NzbDrone.Series.Delete.DeleteSeriesView = Backbone.Marionette.ItemView.extend({
+ template: 'Series/Delete/DeleteSeriesTemplate',
- events: {
- 'click .x-confirm-delete': 'removeSeries'
- },
+ events: {
+ 'click .x-confirm-delete': 'removeSeries'
+ },
- ui: {
- deleteFiles: '.x-delete-files'
- },
+ ui: {
+ deleteFiles: '.x-delete-files'
+ },
- removeSeries: function () {
+ removeSeries: function () {
- var deleteFiles = this.ui.deleteFiles.prop('checked');
+ var deleteFiles = this.ui.deleteFiles.prop('checked');
- this.model.destroy({
- data : { 'deleteFiles': deleteFiles },
- wait : true,
- success: function (model) {
- model.collection.remove(model);
- }
- });
+ this.model.destroy({
+ data: { 'deleteFiles': deleteFiles },
+ wait: true
+ }).done(function () {
+ NzbDrone.modalRegion.close();
+ });
+ }
+ });
- NzbDrone.modalRegion.close();
+ return NzbDrone.Series.Delete.DeleteSeriesView;
- }
});
-
- return NzbDrone.Series.Delete.DeleteSeriesView;
-
-});
diff --git a/UI/Shared/Modal/Region.js b/UI/Shared/Modal/Region.js
index d5311902e..92f56ed25 100644
--- a/UI/Shared/Modal/Region.js
+++ b/UI/Shared/Modal/Region.js
@@ -1,36 +1,44 @@
"use strict";
-define(['marionette', 'bootstrap'], function (Marionette) {
- return Marionette.Region.extend({
- el: "#modal-region",
+define(
+ [
+ 'marionette',
+ 'bootstrap'
+ ], function (Marionette) {
+ return Marionette.Region.extend({
+ el: "#modal-region",
- constructor: function () {
- Backbone.Marionette.Region.prototype.constructor.apply(this, arguments);
- this.on("show", this.showModal, this);
- },
+ constructor: function () {
+ Backbone.Marionette.Region.prototype.constructor.apply(this, arguments);
+ this.on("show", this.showModal, this);
+ },
- getEl: function (selector) {
- var $el = $(selector);
- $el.on("hidden", this.close);
- return $el;
- },
+ getEl: function (selector) {
+ var $el = $(selector);
+ $el.on("hidden", this.close);
+ return $el;
+ },
- showModal: function () {
- this.$el.addClass('modal hide fade');
+ showModal: function () {
+ this.$el.addClass('modal hide fade');
- //need tab index so close on escape works
- //https://github.com/twitter/bootstrap/issues/4663
- this.$el.attr('tabindex', '-1');
- this.$el.modal({
- 'show' : true,
- 'keyboard': true,
- 'backdrop': 'static'});
- },
+ //need tab index so close on escape works
+ //https://github.com/twitter/bootstrap/issues/4663
+ this.$el.attr('tabindex', '-1');
+ this.$el.modal({
+ 'show' : true,
+ 'keyboard': true,
+ 'backdrop': 'static'});
+ },
- closeModal: function () {
- this.$el.modal('hide');
- this.close();
- }
+ onClose: function(){
+ this.closeModal();
+ },
+
+ closeModal: function () {
+ this.$el.modal('hide');
+ }
+
+ });
});
-});
|