svn commit: r510156 - in /lenya/trunk/src/modules/tinymce: java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java usecases/insertAsset.jx xslt/page2edit.xsl

[ne...@apache.org]

Author: nettings
Date: Wed Feb 21 11:13:56 2007
New Revision: 510156

URL: http://svn.apache.org/viewvc?view=rev&rev=510156
Log:
fixes bug http://issues.apache.org/bugzilla/show_bug.cgi?id=40778,
thanks to richard frovarp.
include "compiled" tiny_mce.js because it loads faster than the
human-readable version.

Modified:
    lenya/trunk/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java
    lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
    lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl

Modified: lenya/trunk/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java?view=diff&rev=510156&r1=510155&r2=510156
==============================================================================
--- lenya/trunk/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java (original)
+++ lenya/trunk/src/modules/tinymce/java/src/org/apache/lenya/cms/editors/tinymce/TinyMce.java Wed Feb 21 11:13:56 2007
@@ -113,7 +113,7 @@
         saveDocument(encoding, content);
     }
 
-    /**
+   /**
      * Save the content to the document source. After saving, the XML is
      * validated. If validation errors occur, the usecase transaction is rolled
      * back, so the changes are not persistent. If the validation succeeded, the

Modified: lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx?view=diff&rev=510156&r1=510155&r2=510156
==============================================================================
--- lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx Wed Feb 21 11:13:56 2007
@@ -56,7 +56,7 @@
               <jx:set var="mimeType" value="${asset.getMimeType()}"/>
               <jx:if test="${mimeType.startsWith('image/')}">
                 <jx:set var="doc" value="${usecase.getParameter('document')}"/>
-                <img src="'${cocoon.request.getContextPath()}/${asset.getPublication().getId()}/${asset.getArea()}${asset.getPath()}.${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}'"
+                <img src="${cocoon.request.getContextPath()}/${asset.getPublication().getId()}/${asset.getArea()}${asset.getPath()}.${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"
                   style="height: 32px; vertical-align: middle;"/>&#160;
               </jx:if>
             </td>

Modified: lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl?view=diff&rev=510156&r1=510155&r2=510156
==============================================================================
--- lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl (original)
+++ lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl Wed Feb 21 11:13:56 2007
@@ -57,7 +57,7 @@
   </xsl:text>
   <script language="javascript" 
           type="text/javascript" 
-          src="{$contextPath}/{$publicationid}/modules/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_src.js"
+          src="{$contextPath}/{$publicationid}/modules/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js"
   >&#160;</script>
   <xsl:text>
   </xsl:text>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org