From 02ff0acc64d14c75724442e7f4acc48328ece907 Mon Sep 17 00:00:00 2001 From: Ruud Date: Wed, 17 Dec 2014 17:29:54 +0100 Subject: [PATCH] Update page actions --- couchpotato/core/media/movie/_base/static/list.js | 10 +++++----- couchpotato/core/media/movie/_base/static/page.js | 9 ++++++++- couchpotato/core/media/movie/_base/static/wanted.js | 7 +++---- couchpotato/static/style/main.scss | 4 ---- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/couchpotato/core/media/movie/_base/static/list.js b/couchpotato/core/media/movie/_base/static/list.js index 5004cf19..2e77aaa4 100644 --- a/couchpotato/core/media/movie/_base/static/list.js +++ b/couchpotato/core/media/movie/_base/static/list.js @@ -50,6 +50,10 @@ var MovieList = new Class({ else self.changeView(self.getSavedView() || self.options.view || 'thumb'); + // Create the alphabet nav + if(self.options.navigation) + self.createNavigation(); + self.getMovies(); App.on('movie.added', self.movieAdded.bind(self)); @@ -89,10 +93,6 @@ var MovieList = new Class({ create: function(){ var self = this; - // Create the alphabet nav - if(self.options.navigation) - self.createNavigation(); - if(self.options.load_more) self.scrollspy = new ScrollSpy({ min: function(){ @@ -253,7 +253,7 @@ var MovieList = new Class({ 'class': 'extra' }) ) - ).inject(self.el, 'top'); + ); // Mass edit self.mass_edit_select_class = new Form.Check(self.mass_edit_select); diff --git a/couchpotato/core/media/movie/_base/static/page.js b/couchpotato/core/media/movie/_base/static/page.js index 6cd043c5..e8c9e531 100644 --- a/couchpotato/core/media/movie/_base/static/page.js +++ b/couchpotato/core/media/movie/_base/static/page.js @@ -19,9 +19,13 @@ Page.Movies = new Class({ defaultAction: function(action, params){ var self = this; - if(self.current_page) + if(self.current_page){ self.current_page.hide(); + if(self.current_page.list && self.current_page.list.navigation) + self.current_page.list.navigation.destroy(); + } + var route = new Route(); route.parse(action); @@ -34,6 +38,9 @@ Page.Movies = new Class({ page.open(route.getAction() || 'index', params); page.show(); + if(page.list && page.list.navigation) + page.list.navigation.inject(self.navigation); + self.current_page = page; } diff --git a/couchpotato/core/media/movie/_base/static/wanted.js b/couchpotato/core/media/movie/_base/static/wanted.js index b3da4dee..f3b0a96f 100644 --- a/couchpotato/core/media/movie/_base/static/wanted.js +++ b/couchpotato/core/media/movie/_base/static/wanted.js @@ -10,7 +10,7 @@ var MoviesWanted = new Class({ indexAction: function(){ var self = this; - if(!self.wanted){ + if(!self.list){ self.manual_search = new Element('a', { 'title': 'Force a search for the full wanted list', @@ -20,7 +20,6 @@ var MoviesWanted = new Class({ } }); - self.scan_folder = new Element('a', { 'title': 'Scan a folder and rename all movies in it', 'text': 'Manual folder scan', @@ -30,7 +29,7 @@ var MoviesWanted = new Class({ }); // Wanted movies - self.wanted = new MovieList({ + self.list = new MovieList({ 'identifier': 'wanted', 'status': 'active', 'actions': [MA.IMDB, MA.Trailer, MA.Release, MA.Edit, MA.Refresh, MA.Readd, MA.Delete], @@ -38,7 +37,7 @@ var MoviesWanted = new Class({ 'menu': [self.manual_search, self.scan_folder], 'on_empty_element': App.createUserscriptButtons().addClass('empty_wanted') }); - $(self.wanted).inject(self.el); + $(self.list).inject(self.el); // Check if search is in progress self.startProgressInterval.delay(4000, self); diff --git a/couchpotato/static/style/main.scss b/couchpotato/static/style/main.scss index 3e8b4c87..4a0f6bb9 100644 --- a/couchpotato/static/style/main.scss +++ b/couchpotato/static/style/main.scss @@ -139,10 +139,6 @@ a { } - .alph_nav { - display: none; // Hide for now - } - } @for $i from 1 through 4 {