diff options
Diffstat (limited to 'client/src')
| -rwxr-xr-x | client/src/com/vaadin/DefaultWidgetSet.gwt.xml | 14 | ||||
| -rw-r--r-- | client/src/com/vaadin/Vaadin.gwt.xml | 25 | ||||
| -rw-r--r-- | client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml | 101 |
3 files changed, 72 insertions, 68 deletions
diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml index 26ab7478e0..3aba1f6fee 100755 --- a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml +++ b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml @@ -1,13 +1,13 @@ <module> - <!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the module - you want to extend when creating an extended widget set, or when creating - a specialized widget set with a subset of the components. --> + <!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the + module you want to extend when creating an extended widget set, or when creating + a specialized widget set with a subset of the components. --> - <!-- Hint for WidgetSetBuilder not to automatically update the file --> - <!-- WS Compiler: manually edited --> + <!-- Hint for WidgetSetBuilder not to automatically update the file --> + <!-- WS Compiler: manually edited --> - <inherits name="com.vaadin.Vaadin" /> + <inherits name="com.vaadin.Vaadin" /> - <entry-point class="com.vaadin.client.ApplicationConfiguration" /> + <entry-point class="com.vaadin.client.ApplicationConfiguration" /> </module> diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml index a4eb88d9b4..31eb703e3c 100644 --- a/client/src/com/vaadin/Vaadin.gwt.xml +++ b/client/src/com/vaadin/Vaadin.gwt.xml @@ -12,13 +12,14 @@ <inherits name="com.google.gwt.http.HTTP" /> <inherits name="com.google.gwt.json.JSON" /> - + <inherits name="com.google.gwt.logging.Logging" /> - <!-- Firebug handler is deprecated but for some reason still enabled by default --> + <!-- Firebug handler is deprecated but for some reason still enabled + by default --> <set-property name="gwt.logging.firebugHandler" value="DISABLED" /> <!-- Disable popup logging as we have our own popup logger --> <set-property name="gwt.logging.popupHandler" value="DISABLED" /> - + <inherits name="com.vaadin.VaadinBrowserSpecificOverrides" /> <source path="client" /> @@ -40,19 +41,21 @@ <when-type-assignable class="com.vaadin.client.metadata.ConnectorBundleLoader" /> </generate-with> - - <replace-with class="com.vaadin.client.communication.AtmospherePushConnection"> + + <replace-with + class="com.vaadin.client.communication.AtmospherePushConnection"> <when-type-is class="com.vaadin.client.communication.PushConnection" /> - </replace-with> - - <!-- Set vaadin.profiler to true to include profiling support in the module --> + </replace-with> + + <!-- Set vaadin.profiler to true to include profiling support in the + module --> <define-property name="vaadin.profiler" values="true,false" /> - <set-property name="vaadin.profiler" value="false" /> - + <set-property name="vaadin.profiler" value="false" /> + <replace-with class="com.vaadin.client.Profiler.EnabledProfiler"> <when-type-is class="com.vaadin.client.Profiler" /> <when-property-is name="vaadin.profiler" value="true" /> - </replace-with> + </replace-with> <!-- Use the new cross site linker to get a nocache.js without document.write --> <add-linker name="xsiframe" /> diff --git a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml index ba6c171a7d..45ede928f5 100644 --- a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml +++ b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml @@ -1,54 +1,55 @@ <module> - <!-- This GWT module defines the browser specific overrides used by Vaadin --> - - <!-- Hint for WidgetSetBuilder not to automatically update the file --> - <!-- WS Compiler: manually edited --> - - <!-- Fall through to this rule for everything but IE --> - <replace-with - class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy"> - <when-type-is - class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" /> - </replace-with> - - <replace-with - class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategyIE"> - <when-type-is - class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" /> - <any> - <when-property-is name="user.agent" value="ie8" /> - </any> - </replace-with> - - <!-- Fall through to this rule for everything but IE --> - <replace-with class="com.vaadin.client.ui.VDragAndDropWrapper"> - <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" /> - </replace-with> - - <replace-with class="com.vaadin.client.ui.VDragAndDropWrapperIE"> - <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" /> - <any> - <when-property-is name="user.agent" value="ie8" /> - </any> - </replace-with> - - <!-- Fall through to this rule for everything but IE --> - <replace-with class="com.vaadin.client.LayoutManager"> - <when-type-is class="com.vaadin.client.LayoutManager" /> - </replace-with> - - <replace-with class="com.vaadin.client.LayoutManagerIE8"> - <when-type-is class="com.vaadin.client.LayoutManager" /> - <any> - <when-property-is name="user.agent" value="ie8" /> - </any> - </replace-with> - - <replace-with class="com.vaadin.client.ui.VPopupImpl"> - <when-type-is class="com.google.gwt.user.client.ui.impl.PopupImplMozilla" /> - <when-property-is name="user.agent" value="gecko1_8"/> - </replace-with> - + <!-- This GWT module defines the browser specific overrides used by Vaadin --> + + <!-- Hint for WidgetSetBuilder not to automatically update the file --> + <!-- WS Compiler: manually edited --> + + <!-- Fall through to this rule for everything but IE --> + <replace-with + class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy"> + <when-type-is + class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" /> + </replace-with> + + <replace-with + class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategyIE"> + <when-type-is + class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" /> + <any> + <when-property-is name="user.agent" value="ie8" /> + </any> + </replace-with> + + <!-- Fall through to this rule for everything but IE --> + <replace-with class="com.vaadin.client.ui.VDragAndDropWrapper"> + <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" /> + </replace-with> + + <replace-with class="com.vaadin.client.ui.VDragAndDropWrapperIE"> + <when-type-is class="com.vaadin.client.ui.VDragAndDropWrapper" /> + <any> + <when-property-is name="user.agent" value="ie8" /> + </any> + </replace-with> + + <!-- Fall through to this rule for everything but IE --> + <replace-with class="com.vaadin.client.LayoutManager"> + <when-type-is class="com.vaadin.client.LayoutManager" /> + </replace-with> + + <replace-with class="com.vaadin.client.LayoutManagerIE8"> + <when-type-is class="com.vaadin.client.LayoutManager" /> + <any> + <when-property-is name="user.agent" value="ie8" /> + </any> + </replace-with> + + <replace-with class="com.vaadin.client.ui.VPopupImpl"> + <when-type-is + class="com.google.gwt.user.client.ui.impl.PopupImplMozilla" /> + <when-property-is name="user.agent" value="gecko1_8" /> + </replace-with> + <replace-with class="com.vaadin.client.ui.VPopupImpl"> <when-type-is class="com.google.gwt.user.client.ui.impl.PopupImpl" /> </replace-with> |