Author: brushed
Date: Sun Dec 5 10:30:29 2010
New Revision: 1042307
URL: http://svn.apache.org/viewvc?rev=1042307&view=rev
Log:
v3.0.0-svn-222:
* JSPWIKI-667: Fixed Scorebar issue in Google Chrome. (workaround js
error)
* JSPWIKI-675: Fixed Unicode support in quickEdit (javascript regexp)
* JSPWIKI-674: Fixed support for nested tabbed sections
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1042307&r1=1042306&r2=1042307&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Dec 5 10:30:29 2010
@@ -1,3 +1,13 @@
+2010-12-05 Dirk Frederickx <[email protected]>
+
+ * v3.0.0-svn-222
+
+ * JSPWIKI-667: Fixed Scorebar issue in Google Chrome. (workaround js
error)
+
+ * JSPWIKI-675: Fixed Unicode support in quickEdit (javascript regexp)
+
+ * JSPWIKI-674: Fixed support for nested tabbed sections
+
2010-09-30 Harry Metske <[email protected]>
* 3.0.0-svn-221
Modified: incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js?rev=1042307&r1=1042306&r2=1042307&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js Sun Dec 5
10:30:29 2010
@@ -18,6 +18,8 @@
specific language governing permissions and limitations
under the License.
*/
+/*jslint forin: true, onevar: true, nomen: true, plusplus: true, immed: true */
+/* global console, document, navigator, setTimeout, window */
/*
Script: jspwiki-common.js
@@ -517,7 +519,7 @@ var Wiki = {
SearchBox.initialize();
//fixme;
- HighlightWord( $('pagecontent'), self.prefs.get('PrevQuery') )
+ HighlightWord( $('pagecontent'), self.prefs.get('PrevQuery') );
self.prefs.set('PrevQuery','');
//HighlightWord.initialize();
@@ -575,7 +577,7 @@ var Wiki = {
Example:
> Wiki.confirm("sometext", callback-function(true/false) );
*/
- confirm: function(msg, callack){
+ confirm: function(msg, callback){
//return callback( confirm(msg) ); //standard js
this.dialog
@@ -695,7 +697,7 @@ var Wiki = {
*/
cleanPageName: function(p){
- return p.clean().replace(/[^A-Za-z0-9()&+,-=._$ ]/g, '');
+ return
p.clean().replace(/[^0-9A-Za-z\u00C0-\u1FFF\u2800-\uFFFD()&+,-=._$ ]/g, '');
},
@@ -1015,7 +1017,7 @@ var Wiki = {
}
}
-}
+} ;
@@ -1301,15 +1303,16 @@ var TabbedSection = {
//skip possible relative wrapper element
var rel = tabs.getFirst();
- if(rel.getStyle('position')=='relative') tabs = rel;
+ if(rel.getStyle('position')=='relative'){ tabs = rel; }
tabs.getChildren().addClass('hidetab');
//fixme: id needs to be unique , should not be the TAB name
- tabs.getElementById( this.id.slice(5) ).removeClass('hidetab');
+ tabs.getElement( '#'+ this.id.substr(5)).removeClass('hidetab');
+
}
-}
+};
Wiki.registerPlugin( TabbedSection );
//FIXME: convert to class
//Wiki.registerPlugin( function(page,name){
@@ -1720,7 +1723,7 @@ return new Class({
}
});
-})()
+})();
/*
Class: GraphBar
@@ -1939,7 +1942,8 @@ var GraphBar = new Class({
var v = n.get('text');
barData.push(v);
num &= !isNaN(v.toFloat());
- ddd &= !isNaN(Date.parse(v));
+ /* chrome accepts numbers as valid Dates !! */
+ ddd &= !isNaN(Date.parse(v)) && v.test(/[^\d]/);
});
barData = barData.map(function(b){
@@ -1951,7 +1955,7 @@ var GraphBar = new Class({
return b;
});
- if(maxValue==minValue) maxValue=minValue+1; /* avoid div by 0 */
+ if(maxValue==minValue){ maxValue=minValue+1; }/* avoid div by 0
*/
size = size/(maxValue-minValue);
return barData.map(function(b){
@@ -1970,7 +1974,7 @@ var GraphBar = new Class({
getTableValues: function(node, fieldName){
var table = node.getElement('table');
- if(!table) return false;
+ if(!table){ return false; }
var tlen = table.rows.length, h, l, r, result, i;
if( tlen > 1 ){ /* check for COLUMN based table */
@@ -2515,7 +2519,9 @@ var TablePlugin = new Class({
num &= v.test(/\d+/);
flt &= !isNaN(v.toFloat());
- ddd &= !isNaN(Date.parse(v));
+ /* chrome accepts numbers as valid Dates !! */
+ /* so make sure non-digit chars are present */
+ ddd &= !isNaN(Date.parse(v)) &&
v.test(/[^\d]/);
ip4 &= v.test(/(?:\d{1,3}\.){3}\d{1,3}/);
//169.169.0.1
euro &= v.test(/^[£$â¬][\d.,]+/);
kmgt &= v.test(/(?:[\d.,]+)\s*(?:[kmgt])b/);
//2 MB, 4GB, 1.2kb, 8Tb
@@ -3244,7 +3250,7 @@ var Stripes = {
}).send();
}
-}
+};
/*
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=1042307&r1=1042306&r2=1042307&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Dec 5
10:30:29 2010
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "221";
+ public static final String BUILD = "222";
/**
* This is the generic version string you should use
