diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-19 09:40:20 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-19 09:42:27 +0300 |
| commit | c1a873bc9e47b98c58b298aa6935ab0853e6963f (patch) | |
| tree | 3e8b209c54961473161335159bc98f9316d28a09 /shared/src | |
| parent | 2caaea2df9d558f0ce67daa3b0641cb832538506 (diff) | |
| parent | 4dcace7123b605115efcbb395a320d460eed9c0e (diff) | |
| download | vaadin-framework-c1a873bc9e47b98c58b298aa6935ab0853e6963f.tar.gz vaadin-framework-c1a873bc9e47b98c58b298aa6935ab0853e6963f.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Iac6947bc82bfbbb6856a924e7d538d195cfb405e
Diffstat (limited to 'shared/src')
| -rw-r--r-- | shared/src/com/vaadin/shared/VBrowserDetails.java | 4 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java index 3680e4168e..81a39cdedc 100644 --- a/shared/src/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/com/vaadin/shared/VBrowserDetails.java @@ -68,19 +68,19 @@ public class VBrowserDetails implements Serializable { isGecko = userAgent.indexOf("gecko") != -1 && userAgent.indexOf("webkit") == -1 && userAgent.indexOf("trident/") == -1; - isWebKit = userAgent.indexOf("applewebkit") != -1; isPresto = userAgent.indexOf(" presto/") != -1; isTrident = userAgent.indexOf("trident/") != -1; + isWebKit = !isTrident && userAgent.indexOf("applewebkit") != -1; // browser name isChrome = userAgent.indexOf(" chrome/") != -1; - isSafari = !isChrome && userAgent.indexOf("safari") != -1; isOpera = userAgent.indexOf("opera") != -1; isIE = userAgent.indexOf("msie") != -1 && !isOpera && (userAgent.indexOf("webtv") == -1); // IE 11 no longer contains MSIE in the user agent isIE = isIE || isTrident; + isSafari = !isChrome && !isIE && userAgent.indexOf("safari") != -1; isFirefox = userAgent.indexOf(" firefox/") != -1; // chromeframe diff --git a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java b/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java index 8dd8ef513e..9dda86ad73 100644 --- a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java +++ b/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java @@ -25,4 +25,6 @@ public class DragAndDropWrapperConstants implements Serializable { @Deprecated public static final String DRAG_START_MODE = "dragStartMode"; + public static final String DRAG_START_COMPONENT_ATTRIBUTE = "dragStartComponent"; + } |