From 9f3579b1f8f02eb3f1d506657b36e425954013b4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 27 Apr 2009 05:01:15 -0400
Subject: [PATCH] - Fix wrong column sort order icons (#1485823) - set defult sorting of new column to 'ASC'
---
CHANGELOG | 1 +
skins/default/images/sort_desc.gif | 0
skins/default/images/sort_asc.gif | 0
program/js/app.js | 21 ++++++++-------------
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 16aa823..da99c7e 100644
--- a/CHANGELOG
+++ b/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/program/js/app.js b/program/js/app.js
index 6293392..6080fba 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -599,20 +599,15 @@
// 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;
+ var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : 'ASC';
- // 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;
-
+ 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/skins/default/images/sort_asc.gif b/skins/default/images/sort_asc.gif
index 244db10..2427311 100644
--- a/skins/default/images/sort_asc.gif
+++ b/skins/default/images/sort_asc.gif
Binary files differ
diff --git a/skins/default/images/sort_desc.gif b/skins/default/images/sort_desc.gif
index 2427311..244db10 100644
--- a/skins/default/images/sort_desc.gif
+++ b/skins/default/images/sort_desc.gif
Binary files differ
--
Gitblit v1.9.1