Toolbar/Actioneer callback cleanup

NzbDrone.Core/Datastore/BasicRepository.cs

@@ -32,7 +32,6 @@ namespace NzbDrone.Core.Datastore
         void SetFields(TModel model, params Expression<Func<TModel, object>>[] properties);
         TModel Single();
         PagingSpec<TModel> GetPaged(PagingSpec<TModel> pagingSpec);
-        void DeleteAll();
     }
 
 

NzbDrone.Core/Instrumentation/LogService.cs

@@ -31,7 +31,7 @@ namespace NzbDrone.Core.Instrumentation
 
         public void Execute(ClearLogCommand message)
         {
-            _logRepository.DeleteAll();
+            _logRepository.Purge();
         }
     }
 }

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
                             }
                         ]
                 };

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
                         },
 
                         {

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

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

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

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