svn commit: r561116 - in /lenya/trunk/src/modules/fckeditor: resources/javascript/fckloader.js usecases/fckeditor.jx

Author: rfrovarp
Date: Mon Jul 30 13:53:32 2007
New Revision: 561116

URL: http://svn.apache.org/viewvc?view=rev&rev=561116
Log:
Load custom config file from publication, as many may want to override the default. Also removed a bad glue import that was changed to a plugin.

Modified:
    lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js
    lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx

Modified: lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js?view=diff&rev=561116&r1=561115&r2=561116
==============================================================================
--- lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js (original)
+++ lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js Mon Jul 30 13:53:32 2007
@@ -18,13 +18,13 @@
 function fckloader(requesturi, contextPath)
 {
   var oFCKeditor = new FCKeditor( 'content' ) ;
-  oFCKeditor.BasePath	= contextPath + '/modules/fckeditor/fckeditor/' ;
+  oFCKeditor.BasePath	= '/modules/fckeditor/fckeditor/' ;
   oFCKeditor.Width="800";
   oFCKeditor.Height="700";
   oFCKeditor.Config[ "FullPage" ] = true ;
   oFCKeditor.Config[ "ProcessHTMLEntities" ] = true ;
   oFCKeditor.Config[ "ProcessNumericEntities" ] = true ;
-  oFCKeditor.Config["CustomConfigurationsPath"] = contextPath + "/modules/fckeditor/javascript/fckconfig.js"  ;
+  oFCKeditor.Config["CustomConfigurationsPath"] = "/" + contextPath + "/modules/fckeditor/javascript/fckconfig.js"  ;
   oFCKeditor.ToolbarSet = 'Lenya' ;
 // the current API does not support this anymore. there is a plugin for that job now.
 // with an extra html page, this function could probably be restored easily, which would be

Modified: lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx?view=diff&rev=561116&r1=561115&r2=561116
==============================================================================
--- lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx (original)
+++ lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx Mon Jul 30 13:53:32 2007
@@ -23,15 +23,18 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:cinclude="http://apache.org/cocoon/include/1.0"
   >
-  
+ 
+  <jx:set var="pathInfo" value="${usecase.getSourceURL()}"/>
+  <jx:set var="steps" value="${pathInfo.split('/')}"/>
+  <jx:set var="pubId" value="${java.util.Arrays.asList(steps).get(1)}"/>
+ 
   <script type="text/javascript" src="/modules/fckeditor/fckeditor/fckeditor.js">&#160;</script>
   <script type="text/javascript" src="/modules/fckeditor/javascript/fckloader.js">&#160;</script>
   <script type="text/javascript" src="/modules/editors/javascript/disablebackspace.js">&#160;</script>
   <script type="text/javascript" src="/modules/editors/javascript/org.apache.lenya.editors.js">&#160;</script> 
-  <script type="text/javascript" src="/modules/fckeditor/javascript/fck_lenya_glue.js">&#160;</script>
   <script type="text/javascript">
     function loadfckloader() {
-      fckloader('${usecase.getParameter('requesturi')}', '${request.getContextPath()}');
+      fckloader('${usecase.getParameter('requesturi')}', '${pubId}');
     }
 
     if(typeof window.addEventListener != 'undefined') {