From d86aa138d09c772f9506bf3c0ca2c65a8f33bdfa Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 25 Jun 2012 12:08:59 +0200 Subject: Update to TinyMCE 3.5.4.1 --- .../js/tiny_mce/plugins/contextmenu/editor_plugin_src.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'program/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js') diff --git a/program/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/program/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js index 004d011d0..48b0fff99 100644 --- a/program/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js +++ b/program/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js @@ -27,7 +27,7 @@ * @param {string} url Absolute URL to where the plugin is located. */ init : function(ed) { - var t = this, showMenu, contextmenuNeverUseNative, realCtrlKey; + var t = this, showMenu, contextmenuNeverUseNative, realCtrlKey, hideMenu; t.editor = ed; @@ -42,6 +42,10 @@ */ t.onContextMenu = new tinymce.util.Dispatcher(this); + hideMenu = function(e) { + hide(ed, e); + }; + showMenu = ed.onContextMenu.add(function(ed, e) { // Block TinyMCE menu on ctrlKey and work around Safari issue if ((realCtrlKey !== 0 ? realCtrlKey : e.ctrlKey) && !contextmenuNeverUseNative) @@ -54,13 +58,11 @@ ed.selection.select(e.target); t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageY); - Event.add(ed.getDoc(), 'click', function(e) { - hide(ed, e); - }); + Event.add(ed.getDoc(), 'click', hideMenu); ed.nodeChanged(); }); - + ed.onRemove.add(function() { if (t._menu) t._menu.removeAll(); @@ -78,8 +80,8 @@ if (t._menu) { t._menu.removeAll(); - t._menu.destroy(); - Event.remove(ed.getDoc(), 'click', hide); + t._menu.destroy(); + Event.remove(ed.getDoc(), 'click', hideMenu); t._menu = null; } }; -- cgit v1.2.3