[kupu-checkins] r39157 - in kupu/trunk/kupu/plone: . kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Sun Feb 18 15:29:58 2007
New Revision: 39157

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
   kupu/trunk/kupu/plone/wysiwyg_support.kupu
Log:
Simplify initialisation

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Sun Feb 18 15:29:58 2007
@@ -21,7 +21,7 @@
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 35853 2006-12-18 15:33:46Z duncan $-->
+    <!--$Id: body.kupu 39156 2007-02-18 14:13:16Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
@@ -443,7 +443,7 @@
   
     </div>
   
-    <script type="text/javascript" tal:content="string:       addEventHandler(window, 'load',  function() {           window.kupu = initPloneKupu('${editorid}');           window.kupuui = window.kupu.getTool('ui');           window.drawertool = window.kupu.getTool('drawertool');           window.kupu.initialize();}  , document);"/>
+    <script type="text/javascript" tal:content="string:       addEventHandler(window, 'load',  function() { initPloneKupu('${editorid}'); }, document);"/>
   
       </div>
 

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js	Sun Feb 18 15:29:58 2007
@@ -28,12 +28,13 @@
     var doc = new KupuDocument(iframe);
 
     // now we can create the controller
-    var kupu = new KupuEditor(doc, conf, l);
+    var kupu = window.kupu = new KupuEditor(doc, conf, l);
     kupu.setHTMLBody(initialtext);
 
     // now we can create a UI object which we can use from the UI
     var ui = new KupuUI(prefix+'select.kupu-tb-styles');
     kupu.registerTool('ui', ui);
+    window.kupuui = ui;
 
     // function that returns a function to execute a button command
     var execCommand = function(cmd) {
@@ -227,6 +228,7 @@
     // create some drawers, drawers are some sort of popups that appear when a 
     // toolbar button is clicked
     var drawertool = window.drawertool || new DrawerTool();
+    window.drawertool = drawertool;
     kupu.registerTool('drawertool', drawertool);
 
     var drawerparent = prefix+'div.kupu-librarydrawer-parent';
@@ -266,6 +268,7 @@
     };
     addEventHandler(textarea.form, 'submit', prepareForm, textarea);
 
+    kupu.initialize();
     return kupu;
 };
 

Modified: kupu/trunk/kupu/plone/wysiwyg_support.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wysiwyg_support.kupu	(original)
+++ kupu/trunk/kupu/plone/wysiwyg_support.kupu	Sun Feb 18 15:29:58 2007
@@ -31,11 +31,7 @@
   <kupu:part name="eventhandler">
     <script type="text/javascript"
       tal:content="string:
-      addEventHandler(window, 'load',  function() {
-          window.kupu = initPloneKupu('${editorid}');
-          window.kupuui = window.kupu.getTool('ui');
-          window.drawertool = window.kupu.getTool('drawertool');
-          window.kupu.initialize();}  , document);"></script>
+      addEventHandler(window, 'load',  function() { initPloneKupu('${editorid}'); }, document);"></script>
   </kupu:part>
 
   <kupu:part name="textarea">