Merge commit '9e73a92ae0ccc72f19a4e6a1343fae94ab0a40ad'

sympal · Jun 20, 2010 · a345a3a · a345a3a
2 parents bd85d79 + 9e73a92
commit a345a3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/config/app.yml b/config/app.yml
@@ -106,6 +106,9 @@ all:
 
       TinyMCE:
         label: TinyMCE Rich Text Editor
+        widget_options:
+          # allows tinymce to be seen as the current editor for inline object insertion
+          config: 'handle_event_callback : "sympalHandleTinyMCEEvent"'
         filters: [inline_object]
 
       # special slot type for "column" slots where the widget/validator

diff --git a/lib/plugins/sfSympalEditorPlugin/web/js/editor.js b/lib/plugins/sfSympalEditorPlugin/web/js/editor.js
@@ -107,6 +107,7 @@ function sympalTinyMCETriggerSave()
   tinyMCE.triggerSave();
 }
 
+// handles tinymce event callback, allows tinymce to be seen as the current editor
 function sympalHandleTinyMCEEvent(e)
 {
   if (e.type == 'click')