simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modify the logic of tab selection after deleting rpc setting

Browse source
This commit is contained in:
MaysWind 2018-08-26 22:34:18 +08:00
parent d859e94dcc
commit 4be5492676
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/scripts/controllers/settings-ariang.js
View file

@ -66,6 +66,14 @@
return $scope.context.currentTab === 'rpc' + rpcIndex; return $scope.context.currentTab === 'rpc' + rpcIndex;
}; };
$scope.getCurrentRpcTabIndex = function () {
if ($scope.isCurrentGlobalTab()) {
return -1;
}
return parseInt($scope.context.currentTab.substring(3));
};
$scope.updateTitlePreview = function () { $scope.updateTitlePreview = function () {
$scope.context.titlePreview = getFinalTitle(); $scope.context.titlePreview = getFinalTitle();
}; };
@ -74,7 +82,7 @@
var tabIndex = -1; var tabIndex = -1;
if (!$scope.isCurrentGlobalTab()) { if (!$scope.isCurrentGlobalTab()) {
tabIndex = parseInt($scope.context.currentTab.substring(3)); tabIndex = parseInt($scope.getCurrentRpcTabIndex());
} }
if (tabIndex < $scope.context.rpcSettings.length - 1) { if (tabIndex < $scope.context.rpcSettings.length - 1) {
@ -89,7 +97,7 @@
var tabIndex = -1; var tabIndex = -1;
if (!$scope.isCurrentGlobalTab()) { if (!$scope.isCurrentGlobalTab()) {
tabIndex = parseInt($scope.context.currentTab.substring(3)); tabIndex = parseInt($scope.getCurrentRpcTabIndex());
} }
if (tabIndex > 0) { if (tabIndex > 0) {
@ -246,12 +254,17 @@
ariaNgLocalizationService.confirm('Confirm Remove', 'Are you sure you want to remove rpc setting "{{rpcName}}"?', 'warning', function () { ariaNgLocalizationService.confirm('Confirm Remove', 'Are you sure you want to remove rpc setting "{{rpcName}}"?', 'warning', function () {
setNeedRefreshPage(); setNeedRefreshPage();
var currentIndex = $scope.getCurrentRpcTabIndex();
var index = $scope.context.rpcSettings.indexOf(setting); var index = $scope.context.rpcSettings.indexOf(setting);
ariaNgSettingService.removeRpcSetting(setting); ariaNgSettingService.removeRpcSetting(setting);
$scope.context.rpcSettings.splice(index, 1); $scope.context.rpcSettings.splice(index, 1);
if ($scope.isCurrentRpcTab(index) && index >= $scope.context.rpcSettings.length) { if (currentIndex >= $scope.context.rpcSettings.length) {
$scope.changeRpcTab($scope.context.rpcSettings.length - 1); $scope.changeRpcTab($scope.context.rpcSettings.length - 1);
} else if (currentIndex <= 0 || currentIndex <= index) {
; // Do Nothing
} else { // currentIndex > index
$scope.changeRpcTab(currentIndex - 1);
} }
}, false, { }, false, {
textParams: { textParams: {