From 9f4a723b280fba6d4ee347bd8126eab98baee077 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Thu, 26 May 2016 00:09:00 +0800
Subject: [PATCH] refactor code

---
 app/index.html                               | 12 ++++-----
 app/scripts/controllers/main.js              |  9 +++----
 app/scripts/controllers/task-detail.js       | 11 +++------
 app/scripts/core/utils.js                    | 26 +++++++++++++++++---
 app/scripts/services/ariaNgSettingService.js |  4 +--
 app/views/list.html                          | 20 +++++++--------
 app/views/task-detail.html                   | 12 ++++-----
 7 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/app/index.html b/app/index.html
index 886dd35..f97098c 100644
--- a/app/index.html
+++ b/app/index.html
@@ -62,37 +62,37 @@
                     </a>
                     <ul class="dropdown-menu" role="menu">
                         <li>
-                            <a class="pointer-cursor" ng-click="changeDisplayOrder('default:false')">
+                            <a class="pointer-cursor" ng-click="changeDisplayOrder('default:asc')">
                                 <span translate>Default</span>
                                 <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('default')}"></i>
                             </a>
                         </li>
                         <li>
-                            <a class="pointer-cursor" ng-click="changeDisplayOrder('name:false')">
+                            <a class="pointer-cursor" ng-click="changeDisplayOrder('name:asc')">
                                 <span translate>By File Name</span>
                                 <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('name')}"></i>
                             </a>
                         </li>
                         <li>
-                            <a class="pointer-cursor" ng-click="changeDisplayOrder('size:false')">
+                            <a class="pointer-cursor" ng-click="changeDisplayOrder('size:asc')">
                                 <span translate>By File Size</span>
                                 <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('size')}"></i>
                             </a>
                         </li>
                         <li>
-                            <a class="pointer-cursor" ng-click="changeDisplayOrder('percent:true')">
+                            <a class="pointer-cursor" ng-click="changeDisplayOrder('percent:desc')">
                                 <span translate>By Completed Percent</span>
                                 <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('percent')}"></i>
                             </a>
                         </li>
                         <li>
-                            <a class="pointer-cursor" ng-click="changeDisplayOrder('remain:false')">
+                            <a class="pointer-cursor" ng-click="changeDisplayOrder('remain:asc')">
                                 <span translate>By Remain Time</span>
                                 <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('remain')}"></i>
                             </a>
                         </li>
                         <li>
-                            <a class="pointer-cursor" ng-click="changeDisplayOrder('dspeed:true')">
+                            <a class="pointer-cursor" ng-click="changeDisplayOrder('dspeed:desc')">
                                 <span translate>By Download Speed</span>
                                 <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('dspeed')}"></i>
                             </a>
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
index 8298113..8843218 100644
--- a/app/scripts/controllers/main.js
+++ b/app/scripts/controllers/main.js
@@ -37,14 +37,11 @@
             ariaNgSettingService.setDisplayOrder(newType.getValue());
         };
 
-        $scope.isSetDisplayOrder = function (type, reverse) {
+        $scope.isSetDisplayOrder = function (type) {
             var orderType = utils.parseOrderType(ariaNgSettingService.getDisplayOrder());
+            var targetType = utils.parseOrderType(type);
 
-            if (angular.isUndefined(reverse)) {
-                return orderType.type === type;
-            } else {
-                return orderType.type === type && orderType.reverse === reverse;
-            }
+            return orderType.equals(targetType);
         };
 
         if (ariaNgSettingService.getGlobalStatRefreshInterval() > 0) {
diff --git a/app/scripts/controllers/task-detail.js b/app/scripts/controllers/task-detail.js
index d4a99c9..ad80924 100644
--- a/app/scripts/controllers/task-detail.js
+++ b/app/scripts/controllers/task-detail.js
@@ -81,16 +81,13 @@
             ariaNgSettingService.setFileListDisplayOrder(newType.getValue());
         };
 
-        $scope.isSetFileListDisplayOrder = function (type, reverse) {
+        $scope.isSetFileListDisplayOrder = function (type) {
             var orderType = utils.parseOrderType(ariaNgSettingService.getFileListDisplayOrder());
+            var targetType = utils.parseOrderType(type);
 
-            if (angular.isUndefined(reverse)) {
-                return orderType.type === type;
-            } else {
-                return orderType.type === type && orderType.reverse === reverse;
-            }
+            return orderType.equals(targetType);
         };
-        
+
         $scope.getFileListOrderType = function () {
             return ariaNgSettingService.getFileListDisplayOrder();
         };
diff --git a/app/scripts/core/utils.js b/app/scripts/core/utils.js
index 98ca0ed..5edcea2 100644
--- a/app/scripts/core/utils.js
+++ b/app/scripts/core/utils.js
@@ -150,13 +150,31 @@
             parseOrderType: function (value) {
                 var values = value.split(':');
 
-                return {
+                var obj = {
                     type: values[0],
-                    reverse: values[1] === 'true',
+                    order: values[1],
+                    equals: function (obj) {
+                        if (angular.isUndefined(obj.order)) {
+                            return this.type === obj.type;
+                        } else {
+                            return this.type === obj.type && this.order === obj.order;
+                        }
+                    },
                     getValue: function () {
-                        return this.type + ":" + this.reverse.toString();
+                        return this.type + ":" + this.order;
                     }
-                }
+                };
+
+                Object.defineProperty(obj, 'reverse', {
+                    get: function () {
+                        return this.order === 'desc';
+                    },
+                    set: function (value) {
+                        this.order = (value ? 'desc' : 'asc');
+                    }
+                });
+
+                return obj;
             },
             estimateCompletedPercentFromBitField: function (bitfield) {
                 var totalLength = bitfield.length * 0xf;
diff --git a/app/scripts/services/ariaNgSettingService.js b/app/scripts/services/ariaNgSettingService.js
index 02ef317..4d498e9 100644
--- a/app/scripts/services/ariaNgSettingService.js
+++ b/app/scripts/services/ariaNgSettingService.js
@@ -99,7 +99,7 @@
                 var value = getOption('displayOrder');
 
                 if (!value) {
-                    value = 'default:false';
+                    value = 'default:asc';
                 }
 
                 return value;
@@ -111,7 +111,7 @@
                 var value = getOption('fileListDisplayOrder');
 
                 if (!value) {
-                    value = 'default:false';
+                    value = 'default:asc';
                 }
 
                 return value;
diff --git a/app/views/list.html b/app/views/list.html
index c04f4cc..4ec65bc 100644
--- a/app/views/list.html
+++ b/app/views/list.html
@@ -5,31 +5,31 @@
                 <div class="col-sm-8">
                     <div class="row">
                         <div class="col-sm-8">
-                            <a ng-click="changeDisplayOrder('name:false', true)" translate>File Name</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('name', false), 'fa-sort-desc': isSetDisplayOrder('name', true)}"></i>
+                            <a ng-click="changeDisplayOrder('name:asc', true)" translate>File Name</a>
+                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('name:asc'), 'fa-sort-desc': isSetDisplayOrder('name:desc')}"></i>
                         </div>
                         <div class="col-sm-4">
-                            <a ng-click="changeDisplayOrder('size:false', true)" translate>File Size</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('size', false), 'fa-sort-desc': isSetDisplayOrder('size', true)}"></i>
+                            <a ng-click="changeDisplayOrder('size:asc', true)" translate>File Size</a>
+                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('size:asc'), 'fa-sort-desc': isSetDisplayOrder('size:desc')}"></i>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-2">
                     <div class="row">
                         <div class="col-sm-6">
-                            <a ng-click="changeDisplayOrder('percent:true', true)" translate>Completed Percent</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('percent', false), 'fa-sort-desc': isSetDisplayOrder('percent', true)}"></i>
+                            <a ng-click="changeDisplayOrder('percent:desc', true)" translate>Completed Percent</a>
+                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('percent:asc'), 'fa-sort-desc': isSetDisplayOrder('percent:desc')}"></i>
                         </div>
                         <div class="col-sm-6">
-                            <a ng-click="changeDisplayOrder('remain:false', true)" translate>Remain Time</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('remain', false), 'fa-sort-desc': isSetDisplayOrder('remain', true)}"></i>
+                            <a ng-click="changeDisplayOrder('remain:asc', true)" translate>Remain Time</a>
+                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('remain:asc'), 'fa-sort-desc': isSetDisplayOrder('remain:desc')}"></i>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-2">
                     <div class="row">
-                        <a ng-click="changeDisplayOrder('dspeed:true', true)" translate>Download Speed</a>
-                        <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('dspeed', false), 'fa-sort-desc': isSetDisplayOrder('dspeed', true)}"></i>
+                        <a ng-click="changeDisplayOrder('dspeed:desc', true)" translate>Download Speed</a>
+                        <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('dspeed:asc'), 'fa-sort-desc': isSetDisplayOrder('dspeed:desc')}"></i>
                     </div>
                 </div>
             </div>
diff --git a/app/views/task-detail.html b/app/views/task-detail.html
index e16d826..dc31c60 100644
--- a/app/views/task-detail.html
+++ b/app/views/task-detail.html
@@ -117,16 +117,16 @@
                     <div class="task-table-title hidden-xs">
                         <div class="row">
                             <div class="col-sm-8">
-                                <a ng-click="changeFileListDisplayOrder('name:false', true)" translate>File Name</a>
-                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('name', false), 'fa-sort-desc': isSetFileListDisplayOrder('name', true)}"></i>
+                                <a ng-click="changeFileListDisplayOrder('name:asc', true)" translate>File Name</a>
+                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('name:asc'), 'fa-sort-desc': isSetFileListDisplayOrder('name:desc')}"></i>
                             </div>
                             <div class="col-sm-2">
-                                <a ng-click="changeFileListDisplayOrder('percent:true', true)" translate>Completed Percent</a>
-                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('percent', false), 'fa-sort-desc': isSetFileListDisplayOrder('percent', true)}"></i>
+                                <a ng-click="changeFileListDisplayOrder('percent:desc', true)" translate>Completed Percent</a>
+                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('percent:asc'), 'fa-sort-desc': isSetFileListDisplayOrder('percent:desc')}"></i>
                             </div>
                             <div class="col-sm-2">
-                                <a ng-click="changeFileListDisplayOrder('size:false', true)" translate>File Size</a>
-                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('size', false), 'fa-sort-desc': isSetFileListDisplayOrder('size', true)}"></i>
+                                <a ng-click="changeFileListDisplayOrder('size:asc', true)" translate>File Size</a>
+                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('size:asc'), 'fa-sort-desc': isSetFileListDisplayOrder('size:desc')}"></i>
                             </div>
                         </div>
                     </div>