Fixed bug #16346: htmlArea RTE: fontstyle/fontsize may raise js error on toolbar...
authorStanislas Rolland <typo3@sjbr.ca>
Thu, 11 Nov 2010 05:58:01 +0000 (05:58 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Thu, 11 Nov 2010 05:58:01 +0000 (05:58 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-4@9332 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/plugins/SelectFont/select-font.js

index af43ae5..54a4df4 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-10  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16346: htmlArea RTE: fontstyle/fontsize may raise js error on toolbar update
+
 2010-11-10  Steffen Gebert  <steffen@steffen-gebert.de>
 
        * Fixed bug #16335: Workspace Draft Records are shown in Live Workspace in some cases (Thanks to Joerg Kinast)
index c0d0fd6..c696dc8 100644 (file)
@@ -1,3 +1,7 @@
+2010-11-10  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16346: htmlArea RTE: fontstyle/fontsize may raise js error on toolbar update
+
 2010-11-08  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #16245: htmlArea RTE: When inserting link with IE8, trailing line break is also linked
index a03b06e..85585c0 100644 (file)
@@ -223,7 +223,7 @@ HTMLArea.SelectFont = HTMLArea.Plugin.extend({
                        var value = parentElement.style[this.styleProperty[select.itemId]];
                        if (!value) {
                                if (!Ext.isIE) {
-                                       if (editor.document.defaultView.getComputedStyle(parentElement, null)) {
+                                       if (editor.document.defaultView && editor.document.defaultView.getComputedStyle(parentElement, null)) {
                                                value = editor.document.defaultView.getComputedStyle(parentElement, null).getPropertyValue(this.cssProperty[select.itemId]);
                                        }
                                } else {