From e3901fd7e571d2af9c5f1c54be0a113c990766bc Mon Sep 17 00:00:00 2001 From: alec Date: Mon, 27 Apr 2009 09:01:15 +0000 Subject: - Fix wrong column sort order icons (#1485823) - set defult sorting of new column to 'ASC' git-svn-id: https://svn.roundcube.net/trunk@2433 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/program/js/app.js | 21 ++++++++------------- roundcubemail/skins/default/images/sort_asc.gif | Bin 121 -> 123 bytes roundcubemail/skins/default/images/sort_desc.gif | Bin 123 -> 121 bytes 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 16aa82360..da99c7ef2 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix wrong column sort order icons (#1485823) - Updated TinyMCE to 3.2.3 version - Fix attachment names encoding when charset isn't specified in attachment part (#1484969) - Fix message normal priority problem (#1485820) diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 6293392cb..6080fba31 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -599,20 +599,15 @@ function rcube_webmail() // 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() : null; - - // no sort order specified: toggle - if (sort_order==null) - { - if (this.env.sort_col==sort_col) - sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC'; - else - sort_order = this.env.sort_order; - } - - if (this.env.sort_col==sort_col && this.env.sort_order==sort_order) - break; + var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : 'ASC'; + if (this.env.sort_col==sort_col) { + sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC'; + + if (this.env.sort_order==sort_order) + break; + } + // set table header class $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase())); $('#rcm'+sort_col).addClass('sorted'+sort_order); diff --git a/roundcubemail/skins/default/images/sort_asc.gif b/roundcubemail/skins/default/images/sort_asc.gif index 244db104c..2427311b4 100644 Binary files a/roundcubemail/skins/default/images/sort_asc.gif and b/roundcubemail/skins/default/images/sort_asc.gif differ diff --git a/roundcubemail/skins/default/images/sort_desc.gif b/roundcubemail/skins/default/images/sort_desc.gif index 2427311b4..244db104c 100644 Binary files a/roundcubemail/skins/default/images/sort_desc.gif and b/roundcubemail/skins/default/images/sort_desc.gif differ -- cgit v1.2.3