From dd24ea052b4c6bf013daac47ef03e6c412cb5a3e Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 21 Oct 2018 15:11:59 +0800 Subject: [PATCH] modify method name --- src/scripts/core/root.js | 4 ++-- src/scripts/services/aria2RpcService.js | 16 ++++++++-------- src/scripts/services/aria2TaskService.js | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/scripts/core/root.js b/src/scripts/core/root.js index d25a470..9ca9782 100644 --- a/src/scripts/core/root.js +++ b/src/scripts/core/root.js @@ -198,11 +198,11 @@ }); }); - aria2TaskService.onConnectSuccess(function () { + aria2TaskService.onOperationSuccess(function () { $rootScope.taskContext.rpcStatus = 'Connected'; }); - aria2TaskService.onConnectError(function () { + aria2TaskService.onOperationError(function () { $rootScope.taskContext.rpcStatus = 'Disconnected'; }); diff --git a/src/scripts/services/aria2RpcService.js b/src/scripts/services/aria2RpcService.js index 03a535f..b9763d5 100644 --- a/src/scripts/services/aria2RpcService.js +++ b/src/scripts/services/aria2RpcService.js @@ -7,8 +7,8 @@ var secret = ariaNgSettingService.getCurrentRpcSecret(); var onFirstSuccessCallbacks = []; - var onConnectSuccessCallbacks = []; - var onConnectErrorCallbacks = []; + var onOperationSuccessCallbacks = []; + var onOperationErrorCallbacks = []; var onDownloadStartCallbacks = []; var onDownloadPauseCallbacks = []; var onDownloadStopCallbacks = []; @@ -149,7 +149,7 @@ }); } - fireCustomEvent(onConnectSuccessCallbacks); + fireCustomEvent(onOperationSuccessCallbacks); if (!isConnected) { isConnected = true; @@ -177,7 +177,7 @@ }); } - fireCustomEvent(onConnectErrorCallbacks); + fireCustomEvent(onOperationErrorCallbacks); }; } @@ -471,11 +471,11 @@ onFirstSuccess: function (context) { onFirstSuccessCallbacks.push(context.callback); }, - onConnectSuccess: function (context) { - onConnectSuccessCallbacks.push(context.callback); + onOperationSuccess: function (context) { + onOperationSuccessCallbacks.push(context.callback); }, - onConnectError: function (context) { - onConnectErrorCallbacks.push(context.callback); + onOperationError: function (context) { + onOperationErrorCallbacks.push(context.callback); }, onDownloadStart: function (context) { onDownloadStartCallbacks.push(context.callback); diff --git a/src/scripts/services/aria2TaskService.js b/src/scripts/services/aria2TaskService.js index 9395612..c98b317 100644 --- a/src/scripts/services/aria2TaskService.js +++ b/src/scripts/services/aria2TaskService.js @@ -797,23 +797,23 @@ callback: callback }); }, - onConnectSuccess: function (callback) { + onOperationSuccess: function (callback) { if (!callback) { - ariaNgLogService.warn('[aria2TaskService.onConnectSuccess] callback is null'); + ariaNgLogService.warn('[aria2TaskService.onOperationSuccess] callback is null'); return; } - aria2RpcService.onConnectSuccess({ + aria2RpcService.onOperationSuccess({ callback: callback }); }, - onConnectError: function (callback) { + onOperationError: function (callback) { if (!callback) { - ariaNgLogService.warn('[aria2TaskService.onConnectError] callback is null'); + ariaNgLogService.warn('[aria2TaskService.onOperationError] callback is null'); return; } - aria2RpcService.onConnectError({ + aria2RpcService.onOperationError({ callback: callback });