code refactor

Author: mayswind

src/scripts/config/aria2Options.js

@@ -9,11 +9,11 @@
         //     [readonly: true|false,] //default: false
         //     [defaultValue: '',]
         //     [required: true|false,] //default: false
-        //     [split: '',] //SUPPORT 'text' type
+        //     [separator: '',] //SUPPORT 'text' type
         //     [overrideMode: 'override|append',] //default: override
-        //     [submitFormat: 'string|array'] //default: string, parameter 'split' is required
-        //     [showCount: true|false,] //SUPPORT 'text' type, parameter 'split' is required, default: false
-        //     [trimCount: true|false,] //SUPPORT 'text' type, parameter 'split', 'showCount' is required, default: false
+        //     [submitFormat: 'string|array',] //default: string, parameter 'separator' is required
+        //     [showCount: true|false,] //SUPPORT 'text' type, parameter 'separator' is required, default: false
+        //     [trimCount: true|false,] //SUPPORT 'text' type, parameter 'separator', 'showCount' is required, default: false
         //     [options: [],] //SUPPORT 'option' type
         //     [min: 0,] //SUPPORT 'integer', 'float' type
         //     [max: 0,] //SUPPORT 'integer', 'float' type
@@ -117,7 +117,7 @@
         },
         'no-proxy': {
             type: 'text',
-            split: ',',
+            separator: ',',
             showCount: true
         },
         'out': {
@@ -241,7 +241,7 @@
         },
         'header': {
             type: 'text',
-            split: '\n',
+            separator: '\n',
             overrideMode: 'append',
             submitFormat: 'array',
             showCount: true,
@@ -317,7 +317,7 @@
         },
         'bt-exclude-tracker': {
             type: 'text',
-            split: ',',
+            separator: ',',
             showCount: true
         },
         'bt-external-ip': {
@@ -401,7 +401,7 @@
         },
         'bt-tracker': {
             type: 'text',
-            split: ',',
+            separator: ',',
             showCount: true
         },
         'bt-tracker-connect-timeout': {

src/scripts/directives/setting.js

@@ -177,8 +177,8 @@
                 })();
 
                 scope.getTotalCount = function () {
-                    var fixedValueCount = getTotalCount(scope.fixedValue, scope.option.split, scope.option.trimCount);
-                    var inputValueCount = getTotalCount(scope.optionValue, scope.option.split, scope.option.trimCount);
+                    var fixedValueCount = getTotalCount(scope.fixedValue, scope.option.separator, scope.option.trimCount);
+                    var inputValueCount = getTotalCount(scope.optionValue, scope.option.separator, scope.option.trimCount);
 
                     return fixedValueCount + inputValueCount;
                 };

src/scripts/services/aria2RpcService.js

@@ -255,7 +255,7 @@
         };
 
         var buildArrayOption = function (option, optionSetting) {
-            var items = option.split(optionSetting.split);
+            var items = option.split(optionSetting.separator);
             var result = [];
 
             for (var i = 0; i < items.length; i++) {

src/views/setting.html

@@ -4,7 +4,7 @@
         <em ng-bind="'(' + option.key + ')'"></em>
         <i class="icon-primary fa fa-question-circle" ng-if="(option.descriptionKey | translate) !== ''"
            data-toggle="popover" data-trigger="hover" data-placement="auto top" data-container="body" data-content="{{option.descriptionKey | translate}}"></i>
-        <span class="description" ng-if="option.showCount && option.split && (optionValue || fixedValue)"
+        <span class="description" ng-if="option.showCount && option.separator && (optionValue || fixedValue)"
               ng-bind="'format.settings.total-count' | translate: {count: getTotalCount()}"></span>
         <i class="icon-primary fa fa-info-circle" ng-if="(option.since && option.since !== '')" ng-tooltip="{{('format.requires.aria2-version' | translate: {version: option.since})}}" ng-tooltip-container="body" ng-tooltip-placement="right"></i>
     </div>