[richfaces-svn-commits] JBoss Rich Faces SVN: r14042 - trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-05-06 17:45:16 -0400 (Wed, 06 May 2009)
New Revision: 14042

Modified:
   trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
Log:
https://jira.jboss.org/jira/browse/RF-7040

Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js	2009-05-06 19:47:11 UTC (rev 14041)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js	2009-05-06 21:45:16 UTC (rev 14042)
@@ -7059,9 +7059,15 @@
 				Event.add(n, 'load', t.setupIframe, t);
 				n.src = tinymce.baseURL + '/plugins/safari/blank.htm';
 			} else {
-				if (!isIE || !tinymce.relaxedDomain)
-					t.setupIframe();
-
+				if (!isIE || !tinymce.relaxedDomain) {
+					if (!isWebKit || n.tagName != 'iframe' /* not XHTML mode */) {
+						t.setupIframe();
+					} else {
+						var _t = t;
+						setTimeout(function() { _t.setupIframe(); _t = undefined; }, 0);
+					}
+				}
+				
 				e = n = o = null; // Cleanup
 			}
 		},