diff options
| author | Build Agent <build@vaadin.com> | 2014-04-14 20:14:48 +0300 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-04-14 20:14:48 +0300 |
| commit | 4a3fe8e346ba2f3376492836763383d53e9be689 (patch) | |
| tree | 802da90f0b67ea635a55cc27251e044eb28321e8 /client | |
| parent | afd759e95c0e180b9140882cf99e221800a85609 (diff) | |
| parent | 3ba1e69db01dc1707135db2b64d4c1bdc945a70f (diff) | |
| download | vaadin-framework-4a3fe8e346ba2f3376492836763383d53e9be689.tar.gz vaadin-framework-4a3fe8e346ba2f3376492836763383d53e9be689.zip | |
Merge changes from origin/7.2
e697d8b Merge "Merge branch 'master' into 7.2" into 7.2
4879639 Redo Push reconnect tests.
8314e3c Downgrade Atmosphere client jQuery 2.0.3 -> 1.11.0. (#13374)
dab3e63 Disable PopupView Animations (#13593)
3ba1e69 Update to Atmosphere js 2.1.5.vaadin2 (#13578)
Change-Id: I8205b1d1debeb7c2fd6585021ea76a77abd8403b
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VPopupView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java index 00e39532db..384cb006ce 100644 --- a/client/src/com/vaadin/client/ui/VPopupView.java +++ b/client/src/com/vaadin/client/ui/VPopupView.java @@ -102,7 +102,8 @@ public class VPopupView extends HTML implements Iterable<Widget> { } }); - popup.setAnimationEnabled(true); + // TODO: Enable animations once GWT fix has been merged + popup.setAnimationEnabled(false); popup.setAutoHideOnHistoryEventsEnabled(false); } |