* Fixed bug #7138: RTE is not rendered in Tabs

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

diff --git a/ChangeLog b/ChangeLog
index 29eae48..e9f1f55 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-14  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
+
+       * Fixed bug #7138: RTE is not rendered in Tabs
+
 2008-01-14  Ingo Renner  <ingo@typo3.org>
 
        * fixed #6932: Unlike the default preview language, fields of additionalPreviewLanguages are shown if they are empty. credits Helmut Ummel

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 9f2b54d..97518c7 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-14  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
+
+       * Fixed bug #7138: RTE is not rendered in Tabs
+
 2008-01-11  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * htmlArea RTE: Update manual and version to 1.6.4dev

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
index f6d6284..156f71a 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
@@ -267,7 +267,7 @@ HTMLArea.prototype.getParentElement = function(selection, range) {
                var range = this._createRange(selection);
        }
        var parentElement = range.commonAncestorContainer;
-       while (parentElement.nodeType == 3) {
+       while (parentElement && parentElement.nodeType == 3) {
                parentElement = parentElement.parentNode;
        }
        return parentElement;

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
index e75d98e..f32f3aa 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
@@ -656,7 +656,7 @@ BlockElements = HTMLArea.Plugin.extend({
         * This function gets called when the toolbar is updated
         */
        onUpdateToolbar : function () {
-               if (this.editor._editMode === "textmode") {
+               if (this.editor.getMode() === "textmode" || this.editor._doc.designMode !== "on") {
                        return false;
                }
                var parentElement = this.editor._statusBarTree.selected ? this.editor._statusBarTree.selected : this.editor.getParentElement();

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockStyle/block-style.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockStyle/block-style.js
index 660eda7..590f55e 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockStyle/block-style.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockStyle/block-style.js
@@ -223,9 +223,6 @@ BlockStyle = HTMLArea.Plugin.extend({
                        parent = parent.parentNode;
                }
                
-               if (parent.className && /\S/.test(parent.className)) {
-                       classNames = parent.className.trim().split(" ");
-               }
                if (parent) {
                        tagName = parent.nodeName.toLowerCase();
                        if (parent.className && /\S/.test(parent.className)) {