From: Artur Signell <artur@vaadin.com>
Date: Tue, 20 Dec 2011 10:46:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/6.8'
X-Git-Tag: 7.0.0.alpha1~82
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46903711e7e1f9f47eca6665242a40a891df8bce;p=vaadin-framework.git

Merge remote-tracking branch 'origin/6.8'
---

46903711e7e1f9f47eca6665242a40a891df8bce
diff --cc src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index a3245830f9,7844ccecf1..9bc05dee2e
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@@ -17,9 -17,19 +17,13 @@@
  	<replace-with class="com.vaadin.terminal.gwt.client.VSchedulerImpl">
  		<when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
  	</replace-with>
+ 	
+ 	<replace-with class="com.vaadin.terminal.gwt.client.VDebugConsole">
+ 		<when-type-is class="com.vaadin.terminal.gwt.client.Console" />
+ 	</replace-with>
  
 -	<!-- Use our own history impl for IE to workaround #2931. -->
 -	<replace-with class="com.vaadin.terminal.gwt.client.HistoryImplIEVaadin">
 -		<when-type-is class="com.google.gwt.user.client.impl.HistoryImpl" />
 -		<when-property-is name="user.agent" value="ie6" />
 -	</replace-with>
 -
  	<generate-with
 -		class="com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator">
 +		class="com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator">
  		<when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap" />
  	</generate-with>
  
diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 51a620cf27,fce5b4206c..f4f3643169
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@@ -523,14 -438,18 +523,14 @@@ public class ApplicationConfiguration i
              return communicationFree < FREE_LIMIT;
          }
      }
 -    
 +
      private static DeferredWidgetLoader deferredWidgetLoader;
 -   
 +
      public void onModuleLoad() {
  
 -        // Enable IE6 Background image caching
 -        if (BrowserInfo.get().isIE6()) {
 -            enableIE6BackgroundImageCache();
 -        }
          // Prepare VConsole for debugging
          if (isDebugMode()) {
-             VDebugConsole console = GWT.create(VDebugConsole.class);
+             Console console = GWT.create(Console.class);
              console.setQuietMode(isQuietDebugMode());
              console.init();
              VConsole.setImplementation(console);
diff --cc src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 8257bfae87,cb83d93a72..0a743fcf96
--- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@@ -394,35 -430,6 +426,36 @@@ public class WebBrowser implements Term
              browserDetails = new VBrowserDetails(agent);
          }
  
 +        if (request.getParameter("sw") != null) {
 +            updateClientSideDetails(request.getParameter("sw"),
-                     request.getParameter("sh"), request.getParameter("tzo"),
++                    request.getParameter("sh"), request.getParameter("cw"),
++                    request.getParameter("ch"), request.getParameter("tzo"),
 +                    request.getParameter("rtzo"), request.getParameter("dstd"),
 +                    request.getParameter("dston"),
 +                    request.getParameter("curdate"),
 +                    request.getParameter("td") != null);
 +        }
 +    }
 +
 +    /**
 +     * Checks if the browser is so old that it simply won't work with a Vaadin
 +     * application. Can be used to redirect to an alternative page, show
 +     * alternative content or similar.
 +     * 
 +     * When this method returns true chances are very high that the browser
 +     * won't work and it does not make sense to direct the user to the Vaadin
 +     * application.
 +     * 
 +     * @return true if the browser won't work, false if not the browser is
 +     *         supported or might work
 +     */
 +    public boolean isTooOldToFunctionProperly() {
 +        if (browserDetails == null) {
 +            // Don't know, so assume it will work
 +            return false;
 +        }
 +
 +        return browserDetails.isTooOldToFunctionProperly();
      }
  
  }