Revision: 9758
Author: [email protected]
Date: Wed Feb 23 13:13:01 2011
Log: - Use z-index to layer multiple notifications in hosted.html
- ModuleSpace.java produces well formed HTML, replacing </pre> with </div>
Fixes issues: 5927
Review at http://gwt-code-reviews.appspot.com/1323801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=9758
Modified:
/trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/devmode.js
/trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
/trunk/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/devmode.js Thu
Feb 10 08:56:16 2011
+++ /trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/devmode.js Wed
Feb 23 13:13:01 2011
@@ -110,6 +110,9 @@
+ '<a style="color: #FFFFFF; font-weight: bold;"
href="javascript:location.reload()">'
+ 'REFRESH</a> this page.');
}
+
+// Keep track of z-index to allow layering of multiple glass messages
+var __gwt_glassMessageZIndex = 2147483647;
// Note this method is also used by ModuleSpace.java
function __gwt_displayGlassMessage(summary, details) {
@@ -118,11 +121,13 @@
var outer = topDoc.createElement("div");
// Do not insert whitespace or outer.firstChild will get a text node.
outer.innerHTML =
- '<div
style="position:absolute;z-index:2147483646;left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=75);opacity:0.75;background-color:#000000;"></div>'
+
- '<div
style="position:absolute;z-index:2147483647;left:50px;top:50px;width:600px;color:#FFFFFF;font-family:verdana;">'
+
- '<div style="font-size:30px;font-weight:bold;">' + summary
+ '</div>' +
- '<p style="font-size:15px;">' + details + '</p>' +
- '</div>'
+ '<div style="position:absolute;z-index:' + __gwt_glassMessageZIndex-- +
+ ';left:50px;top:50px;width:600px;color:#FFF;font-family:verdana;">' +
+ '<div style="font-size:30px;font-weight:bold;">' + summary + '</div>' +
+ '<div style="font-size:15px;">' + details + '</div>' +
+ '</div>' +
+ '<div style="position:absolute;z-index:' + __gwt_glassMessageZIndex-- +
+
';left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=60);opacity:0.6;background-color:#000;"></div>'
;
topDoc.body.appendChild(outer);
var glass = outer.firstChild;
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html Thu
Dec 16 11:33:51 2010
+++ /trunk/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html Wed
Feb 23 13:13:01 2011
@@ -163,6 +163,9 @@
+ '<a style="color: #FFFFFF; font-weight: bold;"
href="javascript:location.reload()">'
+ 'REFRESH</a> this page.');
}
+
+// Keep track of z-index to allow layering of multiple glass messages
+var __gwt_glassMessageZIndex = 2147483647;
// Note this method is also used by ModuleSpace.java
function __gwt_displayGlassMessage(summary, details) {
@@ -171,11 +174,13 @@
var outer = topDoc.createElement("div");
// Do not insert whitespace or outer.firstChild will get a text node.
outer.innerHTML =
- '<div
style="position:absolute;z-index:2147483646;left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=75);opacity:0.75;background-color:#000000;"></div>'
+
- '<div
style="position:absolute;z-index:2147483647;left:50px;top:50px;width:600px;color:#FFFFFF;font-family:verdana;">'
+
- '<div style="font-size:30px;font-weight:bold;">' + summary
+ '</div>' +
- '<p style="font-size:15px;">' + details + '</p>' +
- '</div>'
+ '<div style="position:absolute;z-index:' + __gwt_glassMessageZIndex-- +
+ ';left:50px;top:50px;width:600px;color:#FFF;font-family:verdana;">' +
+ '<div style="font-size:30px;font-weight:bold;">' + summary + '</div>' +
+ '<div style="font-size:15px;">' + details + '</div>' +
+ '</div>' +
+ '<div style="position:absolute;z-index:' + __gwt_glassMessageZIndex-- +
+
';left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=60);opacity:0.6;background-color:#000;"></div>'
;
topDoc.body.appendChild(outer);
var glass = outer.firstChild;
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java Tue Oct
5 11:03:13 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java Wed Feb
23 13:13:01 2011
@@ -611,7 +611,7 @@
String details = "<p>Exception while loading module <b>"
+ entryPointTypeName + "</b>. See Development Mode for
details.</p>"
+ "<div style='overflow:visisble;white-space:pre;'>" + stackTrace
- + "</pre>";
+ + "</div>";
invokeNativeVoid("__gwt_displayGlassMessage", null,
new Class[]{String.class, String.class},
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
