You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2008/12/03 20:24:22 UTC
svn commit: r723022 - in /incubator/jspwiki/trunk: ChangeLog
src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Author: jalkanen
Date: Wed Dec 3 11:24:22 2008
New Revision: 723022
URL: http://svn.apache.org/viewvc?rev=723022&view=rev
Log:
JSPWIKI-444: JSPWikiMarkupParser now properly heeds wysiwyg mode with heading permalink anchors.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=723022&r1=723021&r2=723022&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Dec 3 11:24:22 2008
@@ -1,3 +1,10 @@
+2008-11-06 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-20
+
+ * [JSPWIKI-444] Wysiwyg editors (such as FCK) no longer duplicate
+ the permalink anchors.
+
2008-12-02 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-19
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=723022&r1=723021&r2=723022&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Dec 3 11:24:22 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "19";
+ public static final String BUILD = "20";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=723022&r1=723021&r2=723022&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Wed Dec 3 11:24:22 2008
@@ -2894,7 +2894,7 @@
private void closeHeadings()
{
- if( m_lastHeading != null )
+ if( m_lastHeading != null && !m_wysiwygEditorMode )
{
// Add the hash anchor element at the end of the heading
addElement( new Element("a").setAttribute( "class","hashlink" ).setAttribute( "href","#"+m_lastHeading.m_titleAnchor ).setText( "#" ) );