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/05/11 22:21:26 UTC
svn commit: r773676 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog src/com/ecyrd/jspwiki/Release.java
src/webdocs/scripts/jspwiki-commonstyles.js
Author: brushed
Date: Mon May 11 20:21:26 2009
New Revision: 773676
URL: http://svn.apache.org/viewvc?rev=773676&view=rev
Log:
2.8.3-svn-6 : [JSPWIKI-532] %%columns didn't work properly when the first child element was a DOM text element.
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-commonstyles.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=773676&r1=773675&r2=773676&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Mon May 11 20:21:26 2009
@@ -1,3 +1,11 @@
+2009-05-11 Dirk Frederickx <di...@apache.org>
+
+ * 2.8.3-svn-6
+
+ * JSPWIKI-532 %%columns didn't work properly when the first child element was
+ a DOM text element.
+
+
2009-04-23 Harry Metske <me...@apache.org>
* 2.8.3-svn-5
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=773676&r1=773675&r2=773676&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 May 11 20:21:26 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
+ public static final String BUILD = "6";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js?rev=773676&r1=773675&r2=773676&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js Mon May 11 20:21:26 2009
@@ -436,7 +436,7 @@
width = (width=='auto') ? 98/colCount+'%' : width/colCount+'px';
var colDef = new Element('div',{'class':'col','styles':{'width':width}}),
- col = colDef.clone().injectBefore(el.getFirst()),
+ col = colDef.clone().injectTop(el),
n;
while(n = col.nextSibling){
if(n.tagName && n.tagName.toLowerCase() == 'hr'){