You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/07/24 17:08:34 UTC

svn commit: r559077 - in /lenya/trunk/src/modules/tinymce: config/module.xml resources/javascript/tiny_config.js

Author: nettings
Date: Tue Jul 24 08:08:33 2007
New Revision: 559077

URL: http://svn.apache.org/viewvc?view=rev&rev=559077
Log:
updated module version.
re-activated auto resize feature. whitenoise and some comments added to
config.

Modified:
    lenya/trunk/src/modules/tinymce/config/module.xml
    lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js

Modified: lenya/trunk/src/modules/tinymce/config/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/config/module.xml?view=diff&rev=559077&r1=559076&r2=559077
==============================================================================
--- lenya/trunk/src/modules/tinymce/config/module.xml (original)
+++ lenya/trunk/src/modules/tinymce/config/module.xml Tue Jul 24 08:08:33 2007
@@ -22,7 +22,7 @@
   <depends module="org.apache.lenya.modules.resource"/>
   <depends module="org.apache.lenya.modules.editors"/>
   <package>org.apache.lenya.modules</package>
-  <version>0.5.0</version>
+  <version>0.5.1</version>
   <name>TinyMCE Module</name>
   <lenya-version>@lenya.version@</lenya-version>
   <description>Module for the TinyMCE WYSIWYG XHTML editor. Work in

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=559077&r1=559076&r2=559077
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js Tue Jul 24 08:08:33 2007
@@ -22,102 +22,104 @@
 */
 
 
-    currentURL = location.href.replace(/\?.*$/,"");
+currentURL = location.href.replace(/\?.*$/,"");
 
-    config = {
+config = {
 
     /* enable customizable theme */
-    theme    : "advanced",
-
+    theme : "advanced",
+    
     /* only the element whose ID is listed under "elements" will be editable */
-    mode     : "exact",
+    mode : "exact",
     elements : "tinymce.content",
-
-    /* enable plugins for custom save function, fullscreen editing
-      and search-and-replace. */
-    plugins  : "save,fullscreen,searchreplace,table,contextmenu,simplebrowser",
     
-       plugin_simplebrowser_browselinkurl : currentURL + '?lenya.usecase=editors.insertLink',
-       plugin_simplebrowser_browseimageurl : currentURL + '?lenya.usecase=tinymce.insertImage',
-       plugin_simplebrowser_browseflashurl : '',
-     
-
+    /* 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",
+        
     /* grey out the "save" button unless there are unsaved changes: */
-    save_enablewhendirty : false,
-
+    //save_enablewhendirty : false,
+    
     /* some special settings for fullscreen mode (they override the 
-      settings further down) */
+       settings further down) */
     fullscreen_settings : {
-            auto_resize : false,
-            theme_advanced_toolbar_location : "top",
-            theme_advanced_statusbar_location : "bottom"
+        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 : false,
-
+    auto_resize : true,
+    
     /* characters that should be replaced by named XHTML entities.
        cocoon does not define entities by default, so we use none. */
-    entities        : "",
-
+    entities : "",
+    
     /* do not make unicode references, output all special characters unchanged. */
     entity_encoding : "raw",
-
+    
     /* keep linebreaks, don't put everything on one line. this is 
        important for advanced users who want to use the source editor. */
-    remove_linebreaks       : false,
-
+    remove_linebreaks : false,
+    
     /* prettyprint sourcecode on saving FIXME: test. does this do anything? */
     apply_source_formatting : true,
-
+    
     /* if the user inserts a table into a p, split p to create correct code.
-       for nested lists, the inner list is correctly placed in a &lt;li/&gt;
-    fix_list_elements: true;
-    fix_table_elements: true;
-
+       for nested lists, the inner list is correctly placed in a &lt;li/&gt; */
+    fix_list_elements: true,
+    fix_table_elements: true,
+    
+    /* force all stray text nodes into a <p/> element. */
+    forced_root_element: "p",
+    
     /* let tinymce do the layout by itself */
-    theme_advanced_layout_manager     : "SimpleLayout",
-
+    theme_advanced_layout_manager : "SimpleLayout",
+    
     /* the toolbar is placed at the top of the editable area. */
-    theme_advanced_toolbar_location   : "top",
-
+    theme_advanced_toolbar_location : "top",
+    
     /* the statusbar is placed at the bottom. it displays the element path. */
     theme_advanced_statusbar_location : "bottom",
-
+    
     /* the following items define the function buttons your users get to see.
-      for a complete list, see
-      http://tinymce.moxiecode.com/tinymce/docs/reference_buttons.html */
-
+       for a complete list, see
+       http://wiki.moxiecode.com/index.php/TinyMCE:Control_reference */
+    
     theme_advanced_buttons1 :
             "save,undo,redo,search,replace,separator," + 
             "cleanup,code,charmap,visualaid,fullscreen,separator," + 
             "formatselect,styleselect",
-
+    
     theme_advanced_buttons2 : 
             "bold,italic,underline,strikethrough,sub,sup,removeformat,separator," +
             "bullist,numlist,table,separator," + 
             "indent,outdent,separator," + 
             "anchor,link,unlink,image,separator," +
             "help",
-
+    
     /* three button rows are active by default. override. */
     theme_advanced_buttons3 : "",
+    
+    /* 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. */
+    theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6",
+    
+    
+    /*    Lenya/TinyMCE glue code    */
 
-    /* the following items define the allowed elements and attributes on your site. 
-      the default setting is very restrictive to enforce a corporate design and clean
-      code at the expense of flexibility. */
-    theme_advanced_blockformats       : "p,h1,h2,h3,h4",
-
-
-/*
-Lenya/TinyMCE glue code
-*/
-
+    /* 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_browseflashurl : '',
+    
     /* this callback can override arbitrary tinymce commands. neato!
        currently used hooks are "insert image", "insert link" and "save". 
        the handler sits in tiny_lenya_glue.js. */
     execcommand_callback : "LenyaExecCommandHandler",
-
+    
     /* insert custom save handler to do some extra clean-up. */
     save_callback : "LenyaSaveContent"
-    };
+};



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