diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-29 07:43:39 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-01-29 07:43:40 +0000 |
| commit | a681bf8f13163b67f55ec2d334f44f976d3eb161 (patch) | |
| tree | 857a4cc6ef8910db66e256da4256c21d778b6496 /client/src/com/vaadin/DefaultWidgetSet.gwt.xml | |
| parent | 336299a558e74e7366482640c650716880886275 (diff) | |
| parent | e30b3136589799dc95049bcc87d4b7f7e707549e (diff) | |
| download | vaadin-framework-a681bf8f13163b67f55ec2d334f44f976d3eb161.tar.gz vaadin-framework-a681bf8f13163b67f55ec2d334f44f976d3eb161.zip | |
Merge "Merge branch 'origin/grid'"
Diffstat (limited to 'client/src/com/vaadin/DefaultWidgetSet.gwt.xml')
| -rwxr-xr-x | client/src/com/vaadin/DefaultWidgetSet.gwt.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml index 8512d547e3..3047924ac7 100755 --- a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml +++ b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml @@ -8,8 +8,23 @@ <inherits name="com.vaadin.Vaadin" /> + <!-- Elemental is used for handling Json only --> + <inherits name="elemental.Json" /> + <entry-point class="com.vaadin.client.ApplicationConfiguration" /> + <generate-with + class="com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator"> + <when-type-is class="com.vaadin.client.ui.dd.VAcceptCriterionFactory" /> + </generate-with> + + <generate-with + class="com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory"> + <when-type-assignable + class="com.vaadin.client.metadata.ConnectorBundleLoader" /> + </generate-with> + + <!-- Since 7.2. Compile all permutations (browser support) into one Javascript file. Speeds up compilation and does not make the Javascript significantly larger. --> |