- simplified messagelist sort action code

git-svn-id: https://svn.roundcube.net/trunk@2434 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 9 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 6080fba31..443c0f370 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -596,17 +596,12 @@ function rcube_webmail()
 
 
       case 'sort':
-        // get the type of sorting
-        var a_sort = props.split('_');
-        var sort_col = a_sort[0];
-        var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : 'ASC';
+        var sort_order, sort_col = props;
 
-        if (this.env.sort_col==sort_col) {
+        if (this.env.sort_col==sort_col)
           sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
-          
-	  if (this.env.sort_order==sort_order)
-            break;
-	}
+        else
+	  sort_order = 'ASC';
 	
         // set table header class
         $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));