self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-16 11:37:58 +02:00
Code Issues Releases Activity

History and missing show loading

Browse Source
This commit is contained in:
Mark McDowall 2013-06-08 00:57:43 -07:00
parent 37ea5f4b9a
commit 7824060c28
3 changed files with 66 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
UI/History/HistoryLayout.js
View File

@ -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 () {
this.historyCollection = new NzbDrone.History.Collection();
this.historyCollection.fetch();
},
onShow: function () {
this.showTable();
var self = this;
this.history.show(new NzbDrone.Shared.LoadingView());
this.historyCollection = new NzbDrone.History.Collection();
this.historyCollection.fetch()
.done(function () {
self._showTable();
});
//this.toolbar.show(new NzbDrone.Shared.Toolbar.ToolbarLayout({right: [ viewButtons], context: this}));
}

28
UI/Missing/MissingLayout.js
View File

@ -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();
});
}
});
});

76
UI/Series/Index/SeriesIndexLayout.js
View File

@ -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
}));
}
})
;
})
;
});
});