* Fixed bug #3537 (revisited): htmlArea RTE: Correct execCommand argument in previous...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3235 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 244cfb9..f8a78bd 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
        * Fixed bug #7585: Invoking htmlArea RTE block style plugin from other plugin fails in FF3 and IE7
        * Fixed bug #3537: htmlArea RTE: Inconsistent markup when adding tr/td in different ways in Firefox
        * Fixed bug #6767: htmlArea RTE: Merge cells does not work on merged cells
+       * Fixed bug #3537 (revisited): htmlArea RTE: Correct execCommand argument in previous patch
 
 2008-02-19  Ingo Renner  <ingo@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index a849246..e1c3410 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -5,6 +5,7 @@
        * Fixed bug #7585: Invoking htmlArea RTE block style plugin from other plugin fails in FF3 and IE7
        * Fixed bug #3537: htmlArea RTE: Inconsistent markup when adding tr/td in different ways in Firefox
        * Fixed bug #6767: htmlArea RTE: Merge cells does not work on merged cells
+       * Fixed bug #3537 (revisited): htmlArea RTE: Correct execCommand argument in previous patch
 
 2008-02-17  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
index f4fd9f8..0751eda 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
@@ -57,7 +57,7 @@ HTMLArea.prototype._initEditMode = function () {
                try {
                        this._doc.designMode = "on";
                        if (this._doc.queryCommandEnabled("insertbronreturn")) this._doc.execCommand("insertbronreturn", false, this.config.disableEnterParagraphs);
-                       if (this._doc.queryCommandEnabled("enableInlineTableEditing")) this._doc.execCommand("enableInlineTableEditing", false, this.config.buttons.table && this.config.buttons.table.enableHandles);
+                       if (this._doc.queryCommandEnabled("enableInlineTableEditing")) this._doc.execCommand("enableInlineTableEditing", false, (this.config.buttons.table && this.config.buttons.table.enableHandles) ? true : false);
                        if (this._doc.queryCommandEnabled("styleWithCSS")) this._doc.execCommand("styleWithCSS", false, this.config.useCSS);
                                else if (this._doc.queryCommandEnabled("useCSS")) this._doc.execCommand("useCSS", false, !this.config.useCSS);
                } catch(e) {
@@ -464,7 +464,7 @@ HTMLArea.NestedHandler = function(ev,editor,nestedObj,noOpenCloseAction) {
                                                        editor.sizeIframe(-2);
                                                }
                                                if (editor._doc.queryCommandEnabled("insertbronreturn")) editor._doc.execCommand("insertbronreturn", false, editor.config.disableEnterParagraphs);
-                                               if (editor._doc.queryCommandEnabled("enableInlineTableEditing")) editor._doc.execCommand("enableInlineTableEditing", false, editor.config.buttons.table && editor.config.buttons.table.enableHandles);
+                                               if (editor._doc.queryCommandEnabled("enableInlineTableEditing")) editor._doc.execCommand("enableInlineTableEditing", false, (editor.config.buttons.table && editor.config.buttons.table.enableHandles) ? true : false);
                                                if (editor._doc.queryCommandEnabled("styleWithCSS")) editor._doc.execCommand("styleWithCSS", false, editor.config.useCSS);
                                                        else if (editor._doc.queryCommandEnabled("useCSS")) editor._doc.execCommand("useCSS", false, !editor.config.useCSS);
                                        } catch(e) {

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
index 6af8bcd..3ddd136 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
@@ -1246,7 +1246,7 @@ HTMLArea.prototype.setMode = function(mode) {
                        if (HTMLArea.is_gecko) {
                                try {
                                        if (this._doc.queryCommandEnabled("insertbronreturn")) this._doc.execCommand("insertbronreturn", false, this.config.disableEnterParagraphs);
-                                       if (this._doc.queryCommandEnabled("enableInlineTableEditing")) this._doc.execCommand("enableInlineTableEditing", false, this.config.buttons.table && this.config.buttons.table.enableHandles);
+                                       if (this._doc.queryCommandEnabled("enableInlineTableEditing")) this._doc.execCommand("enableInlineTableEditing", false, (this.config.buttons.table && this.config.buttons.table.enableHandles) ? true : false);
                                        if (this._doc.queryCommandEnabled("styleWithCSS")) this._doc.execCommand("styleWithCSS", false, this.config.useCSS);
                                                else if (this._doc.queryCommandEnabled("useCSS")) this._doc.execCommand("useCSS", false, !this.config.useCSS);
                                } catch(e) {}