github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-21 05:53:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ui-notifications' into develop

Browse source 
Conflicts:
	NzbDrone.Common/NzbDrone.Common.csproj
	UI/Series/Details/SeasonLayout.js
This commit is contained in:
Mark McDowall 2013-09-03 07:18:04 -07:00
commit a7eb331d4e
87 changed files with 1322 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

22
UI/Series/Details/SeasonLayout.js
View file

@ -8,9 +8,8 @@ define(
'Cells/EpisodeTitleCell',
'Cells/RelativeDateCell',
'Cells/EpisodeStatusCell',
'Commands/CommandController',
'Shared/Actioneer'
], function (App, Marionette, Backgrid, ToggleCell, EpisodeTitleCell, RelativeDateCell, EpisodeStatusCell, CommandController, Actioneer) {
], function (App, Marionette, Backgrid, ToggleCell, EpisodeTitleCell, RelativeDateCell, EpisodeStatusCell, Actioneer) {
return Marionette.Layout.extend({
template: 'Series/Details/SeasonLayoutTemplate',
@ -103,9 +102,10 @@ define(
seriesId : this.model.get('seriesId'),
seasonNumber: this.model.get('seasonNumber')
},
element : this.ui.seasonSearch,
failMessage : 'Search for season {0} failed'.format(this.model.get('seasonNumber')),
startMessage: 'Search for season {0} started'.format(this.model.get('seasonNumber'))
element : this.ui.seasonSearch,
errorMessage : 'Search for season {0} failed'.format(this.model.get('seasonNumber')),
startMessage : 'Search for season {0} started'.format(this.model.get('seasonNumber')),
successMessage: 'Search for season {0} completed'.format(this.model.get('seasonNumber'))
});
},
@ -145,15 +145,15 @@ define(
_seasonRename: function () {
Actioneer.ExecuteCommand({
command : 'renameSeason',
properties : {
command : 'renameSeason',
properties : {
seriesId : this.model.get('seriesId'),
seasonNumber: this.model.get('seasonNumber')
},
element : this.ui.seasonRename,
failMessage: 'Season rename failed',
context : this,
onSuccess : this._afterRename
element : this.ui.seasonRename,
errorMessage: 'Season rename failed',
context : this,
onSuccess : this._afterRename
});
},

2
UI/Series/Details/SeasonMenu/ItemView.js
View file

@ -51,7 +51,7 @@ define(
seasonNumber: this.model.get('seasonNumber')
},
element : this.ui.seasonSearch,
failMessage : 'Search for season {0} failed'.format(this.model.get('seasonNumber')),
errorMessage: 'Search for season {0} failed'.format(this.model.get('seasonNumber')),
startMessage: 'Search for season {0} started'.format(this.model.get('seasonNumber'))
});
},

10
UI/Series/Details/SeriesDetailsLayout.js
View file

@ -155,10 +155,10 @@ define(
properties : {
seriesId: this.model.get('id')
},
element : this.ui.rename,
context : this,
onSuccess : this._refetchEpisodeFiles,
failMessage: 'Series search failed'
element : this.ui.rename,
context : this,
onSuccess : this._refetchEpisodeFiles,
errorMessage: 'Series search failed'
});
},
@ -169,7 +169,7 @@ define(
seriesId: this.model.get('id')
},
element : this.ui.search,
failMessage : 'Series search failed',
errorMessage: 'Series search failed',
startMessage: 'Search for {0} started'.format(this.model.get('title'))
});
},

4
UI/Series/Index/SeriesIndexLayout.js
View file

@ -105,7 +105,6 @@ define(
title : 'RSS Sync',
icon : 'icon-rss',
command : 'rsssync',
successMessage: 'RSS Sync Completed',
errorMessage : 'RSS Sync Failed!'
},
{
@ -140,7 +139,6 @@ define(
this._fetchCollection();
},
initialize: function () {
this.seriesCollection = SeriesCollection;
@ -148,7 +146,6 @@ define(
this.listenTo(SeriesCollection, 'remove', this._renderView);
},
_renderView: function () {
if (SeriesCollection.length === 0) {
@ -164,7 +161,6 @@ define(
}
},
onShow: function () {
this._showToolbar();
this._renderView();