[google-web-toolkit] r7142 committed - Merge trunk r7141 into this branch...
0 views
Skip to first unread message
codesite...@google.com
Nov 23, 2009, 6:09:19 PM11/23/09
to gwt...@gmail.com
Revision: 7142
Author: j...@google.com
Date: Mon Nov 23 15:06:45 2009
Log: Merge trunk r7141 into this branch
Remove TODOs from hosted.html
svn merge --ignore-ancestry -c7141 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=7142
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
=======================================
--- /releases/2.0/branch-info.txt Mon Nov 23 14:42:20 2009
+++ /releases/2.0/branch-info.txt Mon Nov 23 15:06:45 2009
@@ -1008,3 +1008,8 @@
trunk@7139 was merged into this branch
Disconnected plugin glasspanel lightened to 75% opacity.
svn merge --ignore-ancestry -c7139
https://google-web-toolkit.googlecode.com/svn/trunk .
+
+trunk@7141 was merged into this branch
+ Remove TODOs from hosted.html
+ svn merge --ignore-ancestry -c7141 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
---
/releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
Mon Nov 23 14:42:20 2009
+++
/releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
Mon Nov 23 15:06:45 2009
@@ -1,7 +1,5 @@
<html>
<head><script>
-// TODO(jat): wrap these to reduce namespace issues, and refactor code into
-// separate functions.
var $wnd = parent;
var $doc = $wnd.document;
var $moduleName, $moduleBase, $entry
@@ -51,7 +49,6 @@
var ua = navigator.userAgent.toLowerCase();
if (ua.indexOf("gecko") != -1) {
// install eval wrapper on FF to avoid EvalError problem
- // TODO(jat): should this UA check be more specific (this hits chrome
too)?
var __eval = window.eval;
window.eval = function(s) {
return __eval(s);
@@ -221,21 +218,7 @@
$moduleName = modName;
$moduleBase = modBase;
- /*
- * NOTE: this presently sucks and is the only formulation I can find
that will
- * work across browsers. On a Windows box where both plugins are
registered,
- * FF will instantiate the (non-working) IE plugin. But plugins have
problems
- * that prevent making this easy.
- *
- * The IE plugin will throw an exception in FF if you try to resolve
- * "pluginObject.connect" as a value. Thus the try/catch below.
- *
- * The FF plugin will actually do illegal crashy things in IE if you try
to
- * resolve "pluginEmbed.connect" as a value. Thus we have to try the IE
- * plugin first.
- *
- * Both plugins need some work to make them truly safe.
- */
+ // Note that the order is important
var pluginFinders = [
findPluginXPCOM,
findPluginObject,
@@ -299,8 +282,6 @@
}
window.onunload = function() {
- // TODO: do we need to do anything here or just rely on the plugins
- // unload call?
};
// Lightweight metrics
Author: j...@google.com
Date: Mon Nov 23 15:06:45 2009
Log: Merge trunk r7141 into this branch
Remove TODOs from hosted.html
svn merge --ignore-ancestry -c7141 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=7142
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
=======================================
--- /releases/2.0/branch-info.txt Mon Nov 23 14:42:20 2009
+++ /releases/2.0/branch-info.txt Mon Nov 23 15:06:45 2009
@@ -1008,3 +1008,8 @@
trunk@7139 was merged into this branch
Disconnected plugin glasspanel lightened to 75% opacity.
svn merge --ignore-ancestry -c7139
https://google-web-toolkit.googlecode.com/svn/trunk .
+
+trunk@7141 was merged into this branch
+ Remove TODOs from hosted.html
+ svn merge --ignore-ancestry -c7141 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
---
/releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
Mon Nov 23 14:42:20 2009
+++
/releases/2.0/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
Mon Nov 23 15:06:45 2009
@@ -1,7 +1,5 @@
<html>
<head><script>
-// TODO(jat): wrap these to reduce namespace issues, and refactor code into
-// separate functions.
var $wnd = parent;
var $doc = $wnd.document;
var $moduleName, $moduleBase, $entry
@@ -51,7 +49,6 @@
var ua = navigator.userAgent.toLowerCase();
if (ua.indexOf("gecko") != -1) {
// install eval wrapper on FF to avoid EvalError problem
- // TODO(jat): should this UA check be more specific (this hits chrome
too)?
var __eval = window.eval;
window.eval = function(s) {
return __eval(s);
@@ -221,21 +218,7 @@
$moduleName = modName;
$moduleBase = modBase;
- /*
- * NOTE: this presently sucks and is the only formulation I can find
that will
- * work across browsers. On a Windows box where both plugins are
registered,
- * FF will instantiate the (non-working) IE plugin. But plugins have
problems
- * that prevent making this easy.
- *
- * The IE plugin will throw an exception in FF if you try to resolve
- * "pluginObject.connect" as a value. Thus the try/catch below.
- *
- * The FF plugin will actually do illegal crashy things in IE if you try
to
- * resolve "pluginEmbed.connect" as a value. Thus we have to try the IE
- * plugin first.
- *
- * Both plugins need some work to make them truly safe.
- */
+ // Note that the order is important
var pluginFinders = [
findPluginXPCOM,
findPluginObject,
@@ -299,8 +282,6 @@
}
window.onunload = function() {
- // TODO: do we need to do anything here or just rely on the plugins
- // unload call?
};
// Lightweight metrics
Reply all
Reply to author
Forward
0 new messages