Author: brushed
Date: Wed Oct 1 11:04:37 2008
New Revision: 700850
URL: http://svn.apache.org/viewvc?rev=700850&view=rev
Log:
v2.8.0-beta-15:
* [JSPWIKI-327] Few more tweaks to stabilize the 'back' button handling
after a search.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=700850&r1=700849&r2=700850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Oct 1 11:04:37 2008
@@ -1,3 +1,10 @@
+2008-10-01 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.8.0-beta-15
+
+ * [JSPWIKI-327] Few more tweaks to stabilize the 'back' button
handling after a search.
+
+
2008-09-30 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.8.0-beta-14
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=700850&r1=700849&r2=700850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Oct 1
11:04:37 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "14";
+ public static final String BUILD = "15";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js?rev=700850&r1=700849&r2=700850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Wed Oct 1
11:04:37 2008
@@ -853,10 +853,12 @@
if(location.hash){
/* hash contains query:pagination(-1=all,0,1,2...) */
- var s = location.hash.substr(1).match(/(.*):(-?\d+)$/);
- q2.value = s[1];
- $('start').value = s[2];
- changescope();
+ var s =
decodeURIComponent(location.hash.substr(1)).match(/(.*):(-?\d+)$/);
+ if(s && s.length==3){
+ q2.value = s[1];
+ $('start').value = s[2];
+ changescope();
+ }
}
},
