From 7824060c28adfdeab01cc65d1d856ed2416b8a5d Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 8 Jun 2013 00:57:43 -0700 Subject: [PATCH] History and missing show loading --- UI/History/HistoryLayout.js | 19 ++++--- UI/Missing/MissingLayout.js | 28 +++++----- UI/Series/Index/SeriesIndexLayout.js | 76 ++++++++++++++-------------- 3 files changed, 65 insertions(+), 58 deletions(-) diff --git a/UI/History/HistoryLayout.js b/UI/History/HistoryLayout.js index e8f05d53f..66ec7c34d 100644 --- a/UI/History/HistoryLayout.js +++ b/UI/History/HistoryLayout.js @@ -3,7 +3,8 @@ define([ 'app', 'History/Collection', 'Series/Index/Table/AirDateCell', - 'Shared/Toolbar/ToolbarLayout' + 'Shared/Toolbar/ToolbarLayout', + 'Shared/LoadingView' ], function () { NzbDrone.History.HistoryLayout = Backbone.Marionette.Layout.extend({ @@ -56,7 +57,7 @@ define([ } ], - showTable: function () { + _showTable: function () { this.history.show(new Backgrid.Grid( { @@ -72,13 +73,17 @@ define([ })); }, - initialize: function () { + onShow: function () { + var self = this; + + this.history.show(new NzbDrone.Shared.LoadingView()); + this.historyCollection = new NzbDrone.History.Collection(); - this.historyCollection.fetch(); - }, + this.historyCollection.fetch() + .done(function () { + self._showTable(); + }); - onShow: function () { - this.showTable(); //this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({right: [ viewButtons], context: this})); } diff --git a/UI/Missing/MissingLayout.js b/UI/Missing/MissingLayout.js index a955a0e06..6a1411400 100644 --- a/UI/Missing/MissingLayout.js +++ b/UI/Missing/MissingLayout.js @@ -4,7 +4,8 @@ define([ 'Missing/Collection', 'Series/Index/Table/AirDateCell', 'Series/Index/Table/SeriesStatusCell', - 'Shared/Toolbar/ToolbarLayout' + 'Shared/Toolbar/ToolbarLayout', + 'Shared/LoadingView' ], function () { NzbDrone.Missing.MissingLayout = Backbone.Marionette.Layout.extend({ @@ -48,7 +49,7 @@ define([ } ], - showTable: function () { + _showTable: function () { this.missing.show(new Backgrid.Grid( { row : NzbDrone.Missing.Row, @@ -63,17 +64,16 @@ define([ })); }, - initialize: function () { - this.missingCollection = new NzbDrone.Missing.Collection(); - this.missingCollection.fetch(); - }, - onShow: function () { - this.showTable(); - //this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({right: [ viewButtons], context: this})); - } + var self = this; - }) - ; - }) -; + this.missing.show(new NzbDrone.Shared.LoadingView()); + + this.missingCollection = new NzbDrone.Missing.Collection(); + this.missingCollection.fetch() + .done(function () { + self._showTable(); + }); + } + }); + }); diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js index 4d4ca40c3..f17827073 100644 --- a/UI/Series/Index/SeriesIndexLayout.js +++ b/UI/Series/Index/SeriesIndexLayout.js @@ -7,7 +7,8 @@ define([ 'Series/Index/Table/AirDateCell', 'Series/Index/Table/SeriesStatusCell', 'Shared/Toolbar/ToolbarLayout', - 'Config' + 'Config', + 'Shared/LoadingView' ], function () { NzbDrone.Series.Index.SeriesIndexLayout = Backbone.Marionette.Layout.extend({ @@ -63,6 +64,32 @@ define([ } ], + leftSideButtons: { + type : 'default', + storeState: false, + items : [ + { + title: 'Add Series', + icon : 'icon-plus', + route: 'series/add' + }, + { + title : 'RSS Sync', + icon : 'icon-rss', + command : 'rsssync', + successMessage: 'RSS Sync Completed', + errorMessage : 'RSS Sync Failed!' + }, + { + title : 'Update Library', + icon : 'icon-refresh', + command : 'refreshseries', + successMessage: 'Library was updated!', + errorMessage : 'Library update failed!' + } + ] + }, + showTable: function () { this.series.show(new Backgrid.Grid( @@ -93,12 +120,16 @@ define([ onShow: function () { + //This gets cleared immediately because of the viewButton callback + this.series.show(new NzbDrone.Shared.LoadingView()); + + //TODO: Move this outside of the function - 'this' is not available for the call back though (use string like events?) var viewButtons = { type : 'radio', - storeState : true, - menuKey : 'seriesViewMode', - defaultAction: 'listView', - items : [ + storeState : true, + menuKey : 'seriesViewMode', + defaultAction: 'listView', + items : [ { key : 'tableView', title : '', @@ -120,41 +151,12 @@ define([ ] }; - - var leftSideButtons = { - type : 'default', - storeState: false, - items : [ - { - title: 'Add Series', - icon : 'icon-plus', - route: 'series/add' - }, - { - title : 'RSS Sync', - icon : 'icon-rss', - command : 'rsssync', - successMessage: 'RSS Sync Completed', - errorMessage : 'RSS Sync Failed!' - }, - { - title : 'Update Library', - icon : 'icon-refresh', - command : 'refreshseries', - successMessage: 'Library was updated!', - errorMessage : 'Library update failed!' - } - ] - }; - this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({ right : [ viewButtons], - left : [ leftSideButtons], + left : [ this.leftSideButtons], context: this })); } - }) - ; - }) -; + }); + });