Fixed bug #14084: htmlArea RTE: RTE fails in absence of wizards
authorStanislas Rolland <typo3@sjbr.ca>
Tue, 13 Apr 2010 02:02:45 +0000 (02:02 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Tue, 13 Apr 2010 02:02:45 +0000 (02:02 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7325 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js

index c309a67..0ad3c71 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
        * Fixed bug #13674: htmlArea RTE: Incorrect position of cursor after SHIFT-ENTER in WebKit browser
        * Follow-up to bug #14066: htmlArea RTE: Erratic handling of oncut and onpaste events
        * Updated NEWS.txt as follow-up to #13580: htmlArea RTE: Extjize the RTE
+       * Fixed bug #14084: htmlArea RTE: RTE fails in absence of wizards
 
 2010-04-12  Susanne Moog  <typo3@susanne-moog.de>
 
index fe8d8a5..c16ce4c 100644 (file)
@@ -3,6 +3,7 @@
        * Added feature #13116: htmlArea RTE: Allow to hide counting classes
        * Fixed bug #13674: htmlArea RTE: Incorrect position of cursor after SHIFT-ENTER in WebKit browser
        * Follow-up to bug #14066: htmlArea RTE: Erratic handling of oncut and onpaste events
+       * Fixed bug #14084: htmlArea RTE: RTE fails in absence of wizards
 
 2010-04-11  Stanislas Rolland  <typo3@sjbr.ca>
 
index 32f09aa..4d98090 100644 (file)
@@ -2300,9 +2300,9 @@ HTMLArea.Editor = Ext.extend(Ext.util.Observable, {
                                        // Walk through all nested tabs and inline levels to get correct size
                                this.textAreaInitialSize.wizardsWidth = HTMLArea.util.TYPO3.accessParentElements(parentElements, 'args[0].getWidth()', [this.wizards]);
                        }
+                               // Hide the wizards so that they do not move around while the editor framework is being sized
+                       this.wizards.hide();
                }
-                       // Hide the wizards so that they do not move around while the editor framework is being sized
-               this.wizards.hide();
                        // Plugins register
                this.plugins = {};
                        // Register the plugins included in the configuration
@@ -2422,7 +2422,9 @@ HTMLArea.Editor = Ext.extend(Ext.util.Observable, {
                        // Make the editor visible
                this.show();
                        // Make the wizards visible again
-               this.wizards.show();
+               if (this.wizards) {
+                       this.wizards.show();
+               }
                        // Focus on the first editor that is not hidden
                Ext.iterate(RTEarea, function (editorId, RTE) {
                        if (!Ext.isDefined(RTE.editor) || (RTE.editor.isNested && !HTMLArea.util.TYPO3.allElementsAreDisplayed(RTE.editor.nestedParentElements.sorted))) {