svn commit: r723020 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java

[jalkanen]

Author: jalkanen
Date: Wed Dec  3 11:21:36 2008
New Revision: 723020

URL: http://svn.apache.org/viewvc?rev=723020&view=rev
Log:
JSPWIKI-444: JSPWikiMarkupParser now properly heeds wysiwyg mode with heading 
permalink anchors.

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/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=723020&r1=723019&r2=723020&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Wed Dec  3 11:21:36 
2008
@@ -1,3 +1,10 @@
+2008-12-03  Janne Jalkanen <[EMAIL PROTECTED]>
+
+        * 2.8.2-svn-2
+        
+        * [JSPWIKI-444] Wysiwyg editors (such as FCK) no longer duplicate
+        the permalink anchors.
+
 2008-11-29  Dirk Frederickx <[EMAIL PROTECTED]>
 
         * 2.8.2-svn-1

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=723020&r1=723019&r2=723020&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
 Wed Dec  3 11:21:36 2008
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "1";
+    public static final String     BUILD         = "2";
     
     /**
      *  This is the generic version string you should use

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=723020&r1=723019&r2=723020&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
 Wed Dec  3 11:21:36 2008
@@ -2891,7 +2891,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( "#" ) );