changeset 4165:330d935054ca rhodecode-2.2.5-gpl

rhodecode.js: use last_rev_raw field for revisionSort and raw_date for dateSort, numerical, default 0
author Mads Kiilerich <madski@unity3d.com>
date Wed, 02 Jul 2014 19:03:27 -0400
parents 197bfc8a4f03
children f0e518891d69
files rhodecode/public/js/rhodecode.js
diffstat 1 files changed, 6 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/js/rhodecode.js	Wed Jul 02 19:03:27 2014 -0400
+++ b/rhodecode/public/js/rhodecode.js	Wed Jul 02 19:03:27 2014 -0400
@@ -1660,32 +1660,9 @@
  * TABLE SORTING
  */
 
-// returns a node from given html;
-var fromHTML = function(html){
-    var _html = document.createElement('element');
-    _html.innerHTML = html;
-    return _html;
-}
-
-var get_rev = function(node){
-    var n = node.firstElementChild.firstElementChild;
-
-    if (n===null){
-        return -1
-    }
-    else{
-        out = n.firstElementChild.innerHTML.split(':')[0].replace('r','');
-        return parseInt(out);
-    }
-}
-
-var get_date = function(node){
-    return $(node.firstElementChild).attr('date');
-}
-
 var revisionSort = function(a, b, desc, field) {
-    var a_ = get_rev(fromHTML(a.getData(field)));
-    var b_ = get_rev(fromHTML(b.getData(field)));
+    var a_ = parseInt(a.getData('last_rev_raw') || 0);
+    var b_ = parseInt(b.getData('last_rev_raw') || 0);
 
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
@@ -1699,8 +1676,8 @@
 };
 
 var lastLoginSort = function(a, b, desc, field) {
-    var a_ = a.getData('last_login_raw') || 0;
-    var b_ = b.getData('last_login_raw') || 0;
+    var a_ = parseFloat(a.getData('last_login_raw') || 0);
+    var b_ = parseFloat(b.getData('last_login_raw') || 0);
 
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
@@ -1713,8 +1690,8 @@
 };
 
 var dateSort = function(a, b, desc, field) {
-    var a_ = get_date(fromHTML(a.getData(field)));
-    var b_ = get_date(fromHTML(b.getData(field)));
+    var a_ = parseFloat(a.getData('raw_date') || 0);
+    var b_ = parseFloat(b.getData('raw_date') || 0);
 
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };