From cdf34d56761594748234141b20de4f25da34804b Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 8 Aug 2013 00:38:14 -0700 Subject: [PATCH] Toolbar/Actioneer callback cleanup --- NzbDrone.Core/Datastore/BasicRepository.cs | 1 - NzbDrone.Core/Instrumentation/LogService.cs | 2 +- UI/Logs/Files/Layout.js | 2 +- UI/Logs/Layout.js | 2 +- UI/Series/Details/SeasonLayout.js | 6 +++--- UI/Series/Details/SeriesDetailsLayout.js | 8 ++++---- UI/Shared/Actioneer.js | 12 ++++++------ UI/Shared/Toolbar/Button/ButtonView.js | 12 ++++++------ 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NzbDrone.Core/Datastore/BasicRepository.cs b/NzbDrone.Core/Datastore/BasicRepository.cs index eee37e2cf..daefd7eac 100644 --- a/NzbDrone.Core/Datastore/BasicRepository.cs +++ b/NzbDrone.Core/Datastore/BasicRepository.cs @@ -32,7 +32,6 @@ namespace NzbDrone.Core.Datastore void SetFields(TModel model, params Expression>[] properties); TModel Single(); PagingSpec GetPaged(PagingSpec pagingSpec); - void DeleteAll(); } diff --git a/NzbDrone.Core/Instrumentation/LogService.cs b/NzbDrone.Core/Instrumentation/LogService.cs index 42ed10a79..5e5717571 100644 --- a/NzbDrone.Core/Instrumentation/LogService.cs +++ b/NzbDrone.Core/Instrumentation/LogService.cs @@ -31,7 +31,7 @@ namespace NzbDrone.Core.Instrumentation public void Execute(ClearLogCommand message) { - _logRepository.DeleteAll(); + _logRepository.Purge(); } } } \ No newline at end of file diff --git a/UI/Logs/Files/Layout.js b/UI/Logs/Files/Layout.js index f170f3999..43d9145c6 100644 --- a/UI/Logs/Files/Layout.js +++ b/UI/Logs/Files/Layout.js @@ -78,7 +78,7 @@ define( successMessage : 'Log files have been deleted', errorMessage : 'Failed to delete log files', ownerContext : this, - successCallback: this._refreshLogs + onSuccess: this._refreshLogs } ] }; diff --git a/UI/Logs/Layout.js b/UI/Logs/Layout.js index fda86cc62..698181201 100644 --- a/UI/Logs/Layout.js +++ b/UI/Logs/Layout.js @@ -98,7 +98,7 @@ define( successMessage : 'Logs have been cleared', errorMessage : 'Failed to clear logs', ownerContext : this, - successCallback: this._refreshLogs + onSuccess: this._refreshLogs }, { diff --git a/UI/Series/Details/SeasonLayout.js b/UI/Series/Details/SeasonLayout.js index 8a9892098..0ab75b514 100644 --- a/UI/Series/Details/SeasonLayout.js +++ b/UI/Series/Details/SeasonLayout.js @@ -115,9 +115,9 @@ define( this.model.set(name, !this.model.get(name)); Actioneer.SaveModel({ - context : this, - element : this.ui.seasonMonitored, - alwaysCallback: this._afterSeasonMonitored + context: this, + element: this.ui.seasonMonitored, + always : this._afterSeasonMonitored }); }, diff --git a/UI/Series/Details/SeriesDetailsLayout.js b/UI/Series/Details/SeriesDetailsLayout.js index cb785cd2f..3663fd776 100644 --- a/UI/Series/Details/SeriesDetailsLayout.js +++ b/UI/Series/Details/SeriesDetailsLayout.js @@ -82,9 +82,9 @@ define( this.model.set(name, !this.model.get(name), { silent: true }); Actioneer.SaveModel({ - context : this, - element : this.ui.monitored, - alwaysCallback: this._setMonitoredState() + context: this, + element: this.ui.monitored, + always : this._setMonitoredState() }); }, @@ -116,7 +116,7 @@ define( element : this.ui.refresh, leaveIcon : true, context: this, - successCallback: this._showSeasons + onSuccess: this._showSeasons }); }, diff --git a/UI/Shared/Actioneer.js b/UI/Shared/Actioneer.js index f7d857dfc..929147ff1 100644 --- a/UI/Shared/Actioneer.js +++ b/UI/Shared/Actioneer.js @@ -30,8 +30,8 @@ define(['Commands/CommandController', 'Shared/Messenger'], }); } - if (options.successCallback) { - options.successCallback.call(options.context); + if (options.onSuccess) { + options.onSuccess.call(options.context); } }); @@ -47,8 +47,8 @@ define(['Commands/CommandController', 'Shared/Messenger'], }); } - if (options.failCallback) { - options.failCallback.call(options.context); + if (options.onError) { + options.onError.call(options.context); } }); @@ -63,8 +63,8 @@ define(['Commands/CommandController', 'Shared/Messenger'], options.element.removeClass('icon-nd-spinner'); } - if (options.alwaysCallback) { - options.alwaysCallback.call(options.context); + if (options.always) { + options.always.call(options.context); } }); }, diff --git a/UI/Shared/Toolbar/Button/ButtonView.js b/UI/Shared/Toolbar/Button/ButtonView.js index 8dc30d6c3..32e8b3fbc 100644 --- a/UI/Shared/Toolbar/Button/ButtonView.js +++ b/UI/Shared/Toolbar/Button/ButtonView.js @@ -62,12 +62,12 @@ define( }); } - if (self.model.get('successCallback')) { + if (self.model.get('onSuccess')) { if (!self.model.ownerContext) { throw 'ownerContext must be set.'; } - self.model.get('successCallback').call(self.model.ownerContext); + self.model.get('onSuccess').call(self.model.ownerContext); } }); @@ -83,12 +83,12 @@ define( }); } - if (self.model.get('failCallback')) { + if (self.model.get('onError')) { if (!self.model.ownerContext) { throw 'ownerContext must be set.'; } - self.model.get('failCallback').call(self.model.ownerContext); + self.model.get('onError').call(self.model.ownerContext); } }); @@ -100,12 +100,12 @@ define( } }); - if (self.model.get('alwaysCallback')) { + if (self.model.get('always')) { if (!self.model.ownerContext) { throw 'ownerContext must be set.'; } - self.model.get('alwaysCallback').call(self.model.ownerContext); + self.model.get('always').call(self.model.ownerContext); } } },