Follow-up to bug #11946: htmlArea RTE: reference was made to context menu item after...
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 16 Sep 2009 00:45:56 +0000 (00:45 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 16 Sep 2009 00:45:56 +0000 (00:45 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5934 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js

index a26e76f..4564974 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2009-09-15  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #11915: htmlArea RTE: superfluous span tags in content after server-based cleaning on paste operation
+       * Follow-up to bug #11946: htmlArea RTE: reference was made to context menu item after context menu was closed
 
 2009-09-13  Stanislas Rolland  <typo3@sjbr.ca>
 
index c7cdffe..cf7e434 100644 (file)
@@ -1,6 +1,7 @@
 2009-09-15  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #11915: htmlArea RTE: superfluous span tags in content after server-based cleaning on paste operation
+       * Follow-up to bug #11946: htmlArea RTE: reference was made to context menu item after context menu was closed
 
 2009-09-13  Stanislas Rolland  <typo3@sjbr.ca>
 
index d53f45d..4e522ad 100644 (file)
@@ -554,9 +554,6 @@ ContextMenu.mouseUpHandler = function(item,instance) {
                if (!HTMLArea.is_ie) {
                        HTMLArea._stopEvent(ev);
                }
-               if (!item.__msh.dialog) {
-                       instance.editor.updateToolbar();
-               }
                return false;
        });
 };
@@ -564,6 +561,9 @@ ContextMenu.mouseUpHandler = function(item,instance) {
 ContextMenu.activateHandler = function(item,instance) {
        return (function() {
                item.__msh.action();
+               if (!item.__msh.dialog) {
+                       instance.editor.updateToolbar();
+               }
                instance.closeMenu();
        });
 };