Fixed bug #15880: htmlArea RTE: Context menu not working in TYPO3 4.4.3 and 4.5-dev
authorStanislas Rolland <typo3@sjbr.ca>
Sun, 3 Oct 2010 01:28:32 +0000 (01:28 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sun, 3 Oct 2010 01:28:32 +0000 (01:28 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8943 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 3d8b863..18c9b4a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-10-02  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #15879: htmlArea RTE: Use TYPO3 ExtJS API for RTE notification dialogues
+       * Fixed bug #15880: htmlArea RTE: Context menu not working in TYPO3 4.4.3 and 4.5-dev
 
 2010-09-30  Francois Suter  <francois@typo3.org>
 
index b09a75b..f18a637 100644 (file)
@@ -1,6 +1,7 @@
 2010-10-02  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #15879: htmlArea RTE: Use TYPO3 ExtJS API for RTE notification dialogues
+       * Fixed bug #15880: htmlArea RTE: Context menu not working in TYPO3 4.4.3 and 4.5-dev
 
 2010-09-29  Stanislas Rolland  <typo3@sjbr.ca>
 
index 3f24400..142ff7d 100644 (file)
@@ -273,7 +273,12 @@ Ext.ux.HTMLAreaButton = Ext.extend(Ext.Button, {
                         * @event hotkey
                         * Fires when the button hotkey is pressed
                         */
-                       'hotkey'
+                       'hotkey',
+                       /*
+                        * @event context
+                        * Fires when the button is triggered from the context menu
+                        */
+                       'context'
                );
                this.addListener({
                        afterrender: {
@@ -289,7 +294,10 @@ Ext.ux.HTMLAreaButton = Ext.extend(Ext.Button, {
                this.addListener({
                        hotkey: {
                                fn: this.onHotKey
-                       }
+                       },
+                       context: {
+                               fn: this.onButtonClick
+                       },
                });
                this.setHandler(this.onButtonClick, this);
                        // Monitor toolbar updates in order to refresh the state of the button
index 3f2a86c..f42c70a 100644 (file)
@@ -241,7 +241,7 @@ HTMLArea.ContextMenu = HTMLArea.Plugin.extend({
        onItemClick: function (item, event) {
                var button = this.getButton(item.getItemId());
                if (button) {
-                       button.fireEvent('click', button, event);
+                       button.fireEvent('context', button, event);
                } else if (item.getItemId() === 'DeleteTarget') {
                                // Do not leave a non-ie table cell empty
                        var parent = this.deleteTarget.parent().dom;