You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2009/08/03 21:20:02 UTC

svn commit: r800500 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/webdocs/scripts/jspwiki-common.js

Author: brushed
Date: Mon Aug  3 19:20:02 2009
New Revision: 800500

URL: http://svn.apache.org/viewvc?rev=800500&view=rev
Log:
2.8.3-svn-11 JSPWIKI-581   Fixing %%sortable

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=800500&r1=800499&r2=800500&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Mon Aug  3 19:20:02 2009
@@ -1,3 +1,11 @@
+2009-08-03 Dirk Frederickx <br...@apache.org>
+
+        * 2.8.3-svn-11
+
+        * JSPWIKI-581   Fixing %%sortable, with strange side-effects when sorting table columns
+        with strings. (detected by Stefan Bohn)
+        
+
 2009-06-07 Harry Metske <me...@apache.org>
 
         * 2.8.3-svn-10

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=800500&r1=800499&r2=800500&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Mon Aug  3 19:20:02 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "10";
+    public static final String     BUILD         = "11";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js?rev=800500&r1=800499&r2=800500&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js Mon Aug  3 19:20:02 2009
@@ -1437,7 +1437,7 @@
 				val1 = Sortable.convert( v1.getAttribute('sortvalue') || $getText(v1), datatype ),
 				val2 = Sortable.convert( v2.getAttribute('sortvalue') || $getText(v2), datatype );
 
-			return val1 - val2;
+			return (val1<val2) ? -1 : (val1>val2) ? 1 : 0; 
 			
 		}
 	}