svn commit: r560255 - in /lenya/trunk/src/modules/tinymce: config/cocoon-xconf/usecase-insertAsset.xconf config/cocoon-xconf/usecase-insertImage.xconf resources/javascript/tiny_config.js resources/javascript/tiny_lenya_glue.js xslt/page2edit.xsl

Author: nettings
Date: Fri Jul 27 07:49:46 2007
New Revision: 560255

URL: http://svn.apache.org/viewvc?view=rev&rev=560255
Log:
migrate tinymce to new generic editor usecase api.
delete obsolete local usecases

Removed:
    lenya/trunk/src/modules/tinymce/config/cocoon-xconf/usecase-insertAsset.xconf
    lenya/trunk/src/modules/tinymce/config/cocoon-xconf/usecase-insertImage.xconf
Modified:
    lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js
    lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js
    lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl

Modified: lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js?view=diff&rev=560255&r1=560254&r2=560255
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js Fri Jul 27 07:49:46 2007
@@ -35,20 +35,22 @@
     
     /* enable plugins for custom save function, fullscreen editing
        and search-and-replace. */
-    //plugins : "save,fullscreen,searchreplace,table,contextmenu,simplebrowser",
-    plugins : "fullscreen,searchreplace,table,contextmenu,simplebrowser",
+    plugins : "/*save,fullscreen,*/searchreplace,table,contextmenu,simplebrowser/*,xhtmlxtras*/",
         
     /* grey out the "save" button unless there are unsaved changes: */
     //save_enablewhendirty : false,
     
     /* some special settings for fullscreen mode (they override the 
        settings further down) */
+/*
+    fullscreen_new_window : true,
+
     fullscreen_settings : {
         auto_resize : false,
         theme_advanced_toolbar_location : "top",
         theme_advanced_statusbar_location : "bottom"
     },
-    
+*/    
     /* auto-resize the editing area. docs say this is "experimental"! */
     auto_resize : true,
     
@@ -101,7 +103,10 @@
     
     /* three button rows are active by default. override. */
     theme_advanced_buttons3 : "",
-    
+/*
+    //for xhtmlxtras, use this:
+    theme_advanced_buttons3 : "cite,ins,del,abbr,acronym,attribs",
+*/    
     /* the following items define the elements presented in the "Format" dropdown. 
        the default setting is very restrictive to enforce a corporate design and clean
        code at the expense of flexibility. */
@@ -112,7 +117,7 @@
 
     /* the simplebrowser plugin is used to wire the generic editors.insertFOO usecases into TinyMCE */
     plugin_simplebrowser_browselinkurl : currentURL + '?lenya.usecase=editors.insertLink',
-    plugin_simplebrowser_browseimageurl : currentURL + '?lenya.usecase=tinymce.insertImage',
+    plugin_simplebrowser_browseimageurl : currentURL + '?lenya.usecase=editors.insertImage',
     plugin_simplebrowser_browseflashurl : '',
     
     /* this callback can override arbitrary tinymce commands. neato!

Modified: lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js?view=diff&rev=560255&r1=560254&r2=560255
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js Fri Jul 27 07:49:46 2007
@@ -43,24 +43,16 @@
   return html;
 }
 
-/**
-  * This function is called by the editors.insertLink view to
-  * get default values and to determine which fields will be enabled.
-  * @returns a linkData hash map.
-  */
-function LenyaGetLinkData() {
-  var currentURL = TinyMCE_SimpleBrowserPlugin.options['curl'];
-  return {
-    'href' : currentURL ? currentURL : ""
-  };
-}
 
-/**
-  * This function is called by the editors.insertLink view to
-  * update the editor with the new user-supplied values.
-  */
-function LenyaSetLinkData(linkData) { 
-  TinyMCE_SimpleBrowserPlugin.browserCallback(linkData);
+/* interface to generic editor usecases */
+
+org.apache.lenya.editors.setObjectData = function(objectData) {
+  TinyMCE_SimpleBrowserPlugin.browserCallback(objectData.url);
 }
 
-var lenyaLinkData;
+org.apache.lenya.editors.getObjectData = function() {
+  var currentURL = TinyMCE_SimpleBrowserPlugin.options['curl'];
+  return new org.apache.lenya.editors.ObjectData({
+    url : currentURL ? currentURL : ""
+  });
+}

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=560255&r1=560254&r2=560255
==============================================================================
--- lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl (original)
+++ lenya/trunk/src/modules/tinymce/xslt/page2edit.xsl Fri Jul 27 07:49:46 2007
@@ -81,12 +81,6 @@
   <xsl:comment>custom event handlers for lenya:</xsl:comment>
   <xsl:text>
   </xsl:text>
-  <script language="javascript" 
-          type="text/javascript" 
-          src="/{$publicationid}/modules/tinymce/javascript/tiny_lenya_glue.js"
-  >&#160;</script>
-  <xsl:text>
-  </xsl:text>
   <xsl:comment>the main configuration of tinymce:</xsl:comment>
   <xsl:text>
   </xsl:text>
@@ -105,7 +99,19 @@
   >&#160;</script>
   <xsl:text>
   </xsl:text>
-   <script language="javascript" type="text/javascript">
+  <script language="javascript" 
+          type="text/javascript" 
+          src="/{$publicationid}/modules/editors/javascript/org.apache.lenya.editors.js"
+  >&#160;</script>
+  <xsl:text>
+  </xsl:text>
+  <script language="javascript" 
+          type="text/javascript" 
+          src="/{$publicationid}/modules/tinymce/javascript/tiny_lenya_glue.js"
+  >&#160;</script>
+  <xsl:text>
+  </xsl:text>
+  <script language="javascript" type="text/javascript">
   <xsl:text>
 
 /*