Revision: 5935
Author: rj...@google.com
Date: Mon Aug 10 15:37:54 2009
Log: /trunk c5928 was merged into this branch
   Fixes plugin backwards-compatibility fallback error in Safari introduced  
by trunk r5910:5912
   svn merge -c5928 https://google-web-toolkit.googlecode.com/svn/trunk .


http://code.google.com/p/google-web-toolkit/source/detail?r=5935

Modified:
  /branches/snapshot-2009.08.04-ihm-r5888/branch-info.txt
   
/branches/snapshot-2009.08.04-ihm-r5888/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html

=======================================
--- /branches/snapshot-2009.08.04-ihm-r5888/branch-info.txt     Mon Aug 10  
15:04:08 2009
+++ /branches/snapshot-2009.08.04-ihm-r5888/branch-info.txt     Mon Aug 10  
15:37:54 2009
@@ -18,3 +18,7 @@
  /branches/snapshot-2009.08.04-r5888 c5933 was merged into this branch
    Switch ImageBundleBuilder to use ImageIO.getImageReaders()...
    svn merge -c5933  
https://google-web-toolkit.googlecode.com/svn/branches/snapshot-2009.08.04-r5888
 .
+
+/trunk c5928 was merged into this branch
+  Fixes plugin backwards-compatibility fallback error in Safari introduced  
by trunk r5910:5912
+  svn merge -c5928 https://google-web-toolkit.googlecode.com/svn/trunk .
=======================================
---  
/branches/snapshot-2009.08.04-ihm-r5888/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
     
Fri Aug  7 15:17:40 2009
+++  
/branches/snapshot-2009.08.04-ihm-r5888/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
     
Mon Aug 10 15:37:54 2009
@@ -210,8 +210,9 @@
      var plugin = null;
      for (var i = 0; i < pluginFinders.length; ++i) {
        try {
-        plugin = pluginFinders[i]();
-        if (plugin != null && plugin.init(window)) {
+        var maybePlugin = pluginFinders[i]();
+        if (maybePlugin != null && maybePlugin.init(window)) {
+          plugin = maybePlugin;
            break;
          }
        } catch (e) {

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---

Reply via email to