[kupu-checkins] r34332 - in kupu/trunk/kupu: Extensions plone plone/kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Tue Nov  7 15:50:40 2006
New Revision: 34332

Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/plone/head.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js
Log:
Nuked kupu's context menu. Firefox 2 has a sensible context menu built-in and IE6/7 also have halfway decent context menus. Firefox 1.x now gets the pretty useful default context menu, but that is still an improvement on the broken kupu menu we used to show.

Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Tue Nov  7 15:50:40 2006
@@ -108,6 +108,7 @@
             enabled=True,
             cookable=cookable)
 
+    jstool.manage_removeScript('kupucontextmenu.js');
     for id in js_files(data):
         print >>out, "JS file", id
         jstool.manage_removeScript(id=id)

Modified: kupu/trunk/kupu/plone/head.kupu
==============================================================================
--- kupu/trunk/kupu/plone/head.kupu	(original)
+++ kupu/trunk/kupu/plone/head.kupu	Tue Nov  7 15:50:40 2006
@@ -40,8 +40,6 @@
             tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
     <script type="text/javascript"
             tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
-    <script type="text/javascript"
-            tal:attributes="src string:${portal_url}/kupucontextmenu.js"> </script>
 
     <script type="text/javascript"
             tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>

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	Tue Nov  7 15:50:40 2006
@@ -21,7 +21,7 @@
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 20919 2005-12-09 10:14:44Z duncan $-->
     <!--$Id: xmlconfig.kupu 30512 2006-07-25 10:17:05Z duncan $-->
-    <!--$Id: body.kupu 31913 2006-09-01 10:07:10Z duncan $-->
+    <!--$Id: body.kupu 34311 2006-11-07 11:18:23Z duncan $-->
     <!--$Id: toolbar.kupu 25717 2006-04-12 10:33:01Z fschulze $-->
     <!--$Id: drawers.kupu 21175 2005-12-15 14:25:08Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
@@ -99,7 +99,6 @@
     <script type="text/javascript" tal:attributes="src string:${portal_url}/kupubasetools.js"> </script>
     <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuloggers.js"> </script>
     <script type="text/javascript" tal:attributes="src string:${portal_url}/kupucontentfilters.js"> </script>
-    <script type="text/javascript" tal:attributes="src string:${portal_url}/kupucontextmenu.js"> </script>
 
     <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneeditor.js"> </script>
     <script type="text/javascript" tal:attributes="src string:${portal_url}/kupuploneui.js"> </script>

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	Tue Nov  7 15:50:40 2006
@@ -34,10 +34,6 @@
     var kupu = new KupuEditor(doc, conf, l);
     kupu.setHTMLBody(initialtext);
 
-    // add the contextmenu
-    var cm = new ContextMenu();
-    kupu.setContextMenu(cm);
-
     // 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);