mirror of
https://github.com/Radarr/Radarr
synced 2025-01-01 04:45:35 +00:00
New movie search (#1212)
* add movie search empty template (#1149) * hooked up new route in controller (#1149)
This commit is contained in:
parent
c593f4250d
commit
1b29b89bf1
5 changed files with 29 additions and 8 deletions
|
@ -33,11 +33,15 @@ module.exports = Marionette.Layout.extend({
|
||||||
id : 'add-movies-screen'
|
id : 'add-movies-screen'
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize : function() {
|
initialize : function(options) {
|
||||||
ProfileCollection.fetch();
|
ProfileCollection.fetch();
|
||||||
RootFolderCollection.fetch().done(function() {
|
RootFolderCollection.fetch().done(function() {
|
||||||
RootFolderCollection.synced = true;
|
RootFolderCollection.synced = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (options.action == "search") {
|
||||||
|
this._addMovies(options);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_toggleExisting : function(e) {
|
_toggleExisting : function(e) {
|
||||||
|
@ -50,7 +54,7 @@ module.exports = Marionette.Layout.extend({
|
||||||
|
|
||||||
onShow : function() {
|
onShow : function() {
|
||||||
|
|
||||||
this.workspace.show(new AddMoviesView());
|
this.workspace.show(new AddMoviesView(this.options));
|
||||||
this.ui.$existing.hide();
|
this.ui.$existing.hide();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -72,8 +76,8 @@ module.exports = Marionette.Layout.extend({
|
||||||
AppLayout.modalRegion.show(this.rootFolderLayout);
|
AppLayout.modalRegion.show(this.rootFolderLayout);
|
||||||
},
|
},
|
||||||
|
|
||||||
_addMovies : function() {
|
_addMovies : function(options) {
|
||||||
this.workspace.show(new AddMoviesView());
|
this.workspace.show(new AddMoviesView(options));
|
||||||
},
|
},
|
||||||
|
|
||||||
_addFromList : function() {
|
_addFromList : function() {
|
||||||
|
|
|
@ -26,7 +26,6 @@ module.exports = Marionette.Layout.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize : function(options) {
|
initialize : function(options) {
|
||||||
|
|
||||||
this.isExisting = options.isExisting;
|
this.isExisting = options.isExisting;
|
||||||
this.collection = new AddMoviesCollection();
|
this.collection = new AddMoviesCollection();
|
||||||
|
|
||||||
|
@ -49,6 +48,11 @@ module.exports = Marionette.Layout.extend({
|
||||||
});
|
});
|
||||||
|
|
||||||
this.throttledSearch = _.debounce(this.search, 1000, { trailing : true }).bind(this);
|
this.throttledSearch = _.debounce(this.search, 1000, { trailing : true }).bind(this);
|
||||||
|
|
||||||
|
if (options.action == "search") {
|
||||||
|
this.search({term: options.query});
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
onRender : function() {
|
onRender : function() {
|
||||||
|
|
|
@ -213,6 +213,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.no-movies-found {
|
||||||
|
color: #fff;
|
||||||
|
font-size: 1em;
|
||||||
|
&:hover {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
::-webkit-input-placeholder {
|
::-webkit-input-placeholder {
|
||||||
color: #cccccc;
|
color: #cccccc;
|
||||||
opacity: 0.25;
|
opacity: 0.25;
|
||||||
|
|
|
@ -19,9 +19,9 @@ module.exports = NzbDroneController.extend({
|
||||||
this.showMainRegion(new AddSeriesLayout({ action : action }));
|
this.showMainRegion(new AddSeriesLayout({ action : action }));
|
||||||
},
|
},
|
||||||
|
|
||||||
addMovies : function(action) {
|
addMovies : function(action, query) {
|
||||||
this.setTitle("Add Movie");
|
this.setTitle("Add Movie");
|
||||||
this.showMainRegion(new AddMoviesLayout({action : action}));
|
this.showMainRegion(new AddMoviesLayout({ action : action, query : query }));
|
||||||
},
|
},
|
||||||
|
|
||||||
calendar : function() {
|
calendar : function() {
|
||||||
|
|
|
@ -14,7 +14,7 @@ var substringMatcher = function() {
|
||||||
var matches = _.select(FullMovieCollection.toJSON(), function(series) {
|
var matches = _.select(FullMovieCollection.toJSON(), function(series) {
|
||||||
return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1;
|
return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1;
|
||||||
});
|
});
|
||||||
cb(matches);
|
cb(matches);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -28,6 +28,11 @@ $.fn.bindSearch = function() {
|
||||||
displayKey : function(series) {
|
displayKey : function(series) {
|
||||||
return series.title + ' (' + series.year + ')';
|
return series.title + ' (' + series.year + ')';
|
||||||
},
|
},
|
||||||
|
templates : {
|
||||||
|
empty : function(input) {
|
||||||
|
return '<div class="tt-dataset-series"><span class="tt-suggestions" style="display: block;"><div class="tt-suggestion"><p style="white-space: normal;"><a class="no-movies-found" href="/addmovies/search/' + input.query + '">Search for "' + input.query + '"</a></p></div></span></div>'
|
||||||
|
},
|
||||||
|
},
|
||||||
source : substringMatcher()
|
source : substringMatcher()
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue