From 1f1b6b47ac95a5f378a3099cae2f7520c77faed2 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 7 Jul 2009 13:01:04 +0000
Subject: [PATCH] #3126 - Added a portal default widget set with IE8 fixes

svn changeset:8344/svn branch:6.0
---
 build/build.xml                               | 27 +++++++++++++++++-
 .../gwt/PortalDefaultWidgetSet.gwt.xml        | 28 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 src/com/vaadin/terminal/gwt/PortalDefaultWidgetSet.gwt.xml

diff --git a/build/build.xml b/build/build.xml
index c10c55a75f..bc5f19fddd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -788,6 +788,27 @@
 		<echo>Compiled DefaultWidgetSet</echo>
 	</target>
 
+	<target name="compile-widgetset-portal-default">
+		<echo>Compiling src (client-side)</echo>
+		<echo>com.vaadin.terminal.gwt.PortalDefaultWidgetSet</echo>
+		<java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m">
+			<arg value="-war" />
+			<arg value="${output-dir}/WebContent/VAADIN/widgetsets" />
+			<arg value="com.vaadin.terminal.gwt.PortalDefaultWidgetSet" />
+			<arg value="-style" />
+			<arg value="OBF" />
+            <jvmarg value="-Xss8M"/>
+            <jvmarg value="-Djava.awt.headless=true"/>
+			<classpath>
+				<pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+				<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
+				<pathelement location="${result-path}/src" />
+			</classpath>
+		</java>
+		<antcall target="remove-widgetset-gwt-tmp"/>
+		<echo>Compiled PortalDefaultWidgetSet</echo>
+	</target>
+
 	<target name="compile-widgetset-reserver">
 		<condition property="googlemaps-jar" value="${output-dir}/WebContent/demo/lib/reservr/gwt-maps.jar">
 			<available file="${output-dir}/WebContent/demo/lib/reservr/gwt-maps.jar" />
@@ -886,7 +907,7 @@
 	</target>
 
 	<!-- Builds the client-side engine, i.e., the widgetsets. -->
-	<target name="compile-client-side" depends="compile-widgetset-default, compile-widgetset-reserver, compile-widgetset-sampler, compile-widgetset-colorpicker, compile-widgetset-coverflow">
+	<target name="compile-client-side" depends="compile-widgetset-default, compile-widgetset-portal-default, compile-widgetset-reserver, compile-widgetset-sampler, compile-widgetset-colorpicker, compile-widgetset-coverflow">
         <!-- Building the widgetsets is currently done sequentially, because
             parallel compilation takes too much memory for most machines. -->
 	</target>
@@ -921,6 +942,10 @@
 	<target name="widgetset-default" depends="init-nonpackage, compile-widgetset-default">
 	</target>
 
+	<!-- Builds the default portal widgetset locally, i.e., not for an installation package. -->
+	<target name="widgetset-portal-default" depends="init-nonpackage, compile-widgetset-portal-default">
+	</target>
+
 	<!-- Builds the sampler widgetset locally, i.e., not for an installation package. -->
 	<target name="widgetset-sampler" depends="init-nonpackage, compile-widgetset-sampler">
 	</target>
diff --git a/src/com/vaadin/terminal/gwt/PortalDefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/PortalDefaultWidgetSet.gwt.xml
new file mode 100644
index 0000000000..0601679480
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/PortalDefaultWidgetSet.gwt.xml
@@ -0,0 +1,28 @@
+<module>
+	<!-- Inherit the DefaultWidgetSet -->
+	<inherits name="com.vaadin.demo.sampler.gwt.SamplerWidgetSet" />
+
+	<!--
+		Workaround for IE8 issues. To be removed when a new GWT version
+		arrives
+	-->
+
+	<define-property name="vaadin.is.ie8" values="true,false" />
+
+	<property-provider name="vaadin.is.ie8"><![CDATA[
+       var ua = navigator.userAgent.toLowerCase();
+
+		if (ua.indexOf("msie") != -1) {
+        	if (document.documentMode >= 8) {
+          		return "true";
+          		}
+          	}
+        return "false";
+          
+  	]]></property-provider>
+
+	<replace-with class="com.google.gwt.user.client.ui.impl.PopupImpl">
+		<when-type-is class="com.google.gwt.user.client.ui.impl.PopupImpl" />
+		<when-property-is name="vaadin.is.ie8" value="true" />
+	</replace-with>
+</module>
-- 
2.39.5