Fixed error in IE7 when trying to access elements in iframe as part o…

…f a beforeunload event.
glow · Oct 5, 2009 · 22ece81 · 22ece81
1 parent 9d614c4
commit 22ece81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/widgets/editor/editor.js b/src/widgets/editor/editor.js
@@ -1505,8 +1505,10 @@ Idler.prototype._stop = function() {
 					// see Webkit bug related to onbeforeunload and iframes 
 					// https://bugs.webkit.org/show_bug.cgi?id=21699
 					// http://code.google.com/p/chromium/issues/detail?id=5773
-					events.addListener(that.element[0].contentWindow, 'beforeunload', function () { that.editor.commit(); return true; } );
-					events.addListener(window, 'beforeunload', function () { that.editor.commit(); return true; } );
+					if (glow.env.webkit) {
+						events.addListener(that.element[0].contentWindow, 'beforeunload', function () { that.editor.commit(); return true; } );
+						events.addListener(window, 'beforeunload', function () { that.editor.commit(); return true; } );
+					}
 
 					// Give the toolbar one focusable button
 					// Boolean that we use to make sure we only do this once

diff --git a/src/widgets/widgets.editor.css b/src/widgets/widgets.editor.css
@@ -160,7 +160,7 @@
 		.glowCSSVERSION-editor .glowCSSVERSION-hidden { position: absolute; left: -2500px; width: 1px; }
 
 		/* without images */
-		.glowCSSVERSION-basic .glowCSSVERSION-editor .editor-toolbar-icon span { border: none; height: auto; overflow: normal; width: auto; }
+		.glowCSSVERSION-basic .glowCSSVERSION-editor .editor-toolbar-icon span { border: none; height: auto; overflow: hidden; width: auto; }
 		.glowCSSVERSION-basic .glowCSSVERSION-editor .editor-toolbar-item .hover span span { border: 1px solid #000; }
 
 		.glowCSSVERSION-editor iframe { border: 0; margin: 0; padding: 0; width: 100%; }