Merge master into valo7.3.0.alpha2

This change does not include all release notes updates
from master.

Change-Id: I209dc06d03d4541ac33746d1161630f0ca8ae5d9

6 files changed, 39 insertions, 26 deletions

diff --git a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
index e66f02e207..86000abd7c 100644
--- a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
+++ b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
@@ -6,6 +6,8 @@
 	-webkit-border-radius: 4px;
 	border-radius: 4px;
 	position: relative;
+	-ms-touch-action: none;
+	touch-action: none;
 }
 [draggable=true] {
 	-khtml-user-drag: element;
diff --git a/WebContent/VAADIN/themes/base/slider/slider.scss b/WebContent/VAADIN/themes/base/slider/slider.scss
index 9ef94d9d9e..60047bc6db 100644
--- a/WebContent/VAADIN/themes/base/slider/slider.scss
+++ b/WebContent/VAADIN/themes/base/slider/slider.scss
@@ -10,7 +10,6 @@
 	background: #eee;
 	border-left: 1px solid #ddd;
 	border-right: 1px solid #eee;
-	
 }
 .#{$primaryStyleName}-handle {
 	background: #aaa;
@@ -18,6 +17,8 @@
 	height: 12px;
 	margin-top: -5px;
 	font-size: 0;
+	-ms-touch-action: none;
+	touch-action: none;
 }
 
 .#{$primaryStyleName}-vertical {
diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss
index bae740257f..968894d92d 100644
--- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss
+++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss
@@ -15,6 +15,8 @@
 	background: #ddd;
 	cursor: e-resize;
 	cursor: col-resize;
+	-ms-touch-action: none;
+	touch-action: none
 }
 .v-disabled .#{$primaryStyleName}-hsplitter div {
 	cursor: default;
@@ -27,6 +29,8 @@
 	background: #ddd;
 	cursor: s-resize;
 	cursor: row-resize;
+	-ms-touch-action: none;
+	touch-action: none;
 }
 .v-disabled .#{$primaryStyleName}-vsplitter div {
 	cursor: default;
diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.scss b/WebContent/VAADIN/themes/base/treetable/treetable.scss
index 934e66097c..e4d41eefa8 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.scss
+++ b/WebContent/VAADIN/themes/base/treetable/treetable.scss
@@ -26,7 +26,6 @@
 
 .#{$primaryStyleName} .v-table-row .v-table-cell-content,
 .#{$primaryStyleName} .v-table-row-odd .v-table-cell-content {
-    position: relative;
     z-index: 10;
 }
 
diff --git a/WebContent/VAADIN/themes/tests-table/styles.css b/WebContent/VAADIN/themes/tests-table/styles.css
new file mode 100644
index 0000000000..78193c0982
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-table/styles.css
@@ -0,0 +1,5 @@
+@import url(../reindeer/legacy-styles.css);
+
+.v-table-footer-container, .v-table-cell-wrapper {
+    text-align: center;
+}
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index bab759b812..fc0fb9b948 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -108,29 +108,29 @@
 					// No special url defined, use the same URL that loaded this page (without the fragment)
 					url = window.location.href.replace(/#.*/,'');
 				}
-				url += ((/\?/).test(url) ? "&" : "?") + "v-browserDetails=1";
+				// Timestamp to avoid caching
+				url += ((/\?/).test(url) ? "&" : "?") + "v-" + (new Date()).getTime();		
+				
+				var params = "v-browserDetails=1";
 				var rootId = getConfig("v-rootId");
 				if (rootId !== undefined) {
-					url += "&v-rootId=" + rootId;
+					params += "&v-rootId=" + rootId;
 				}
 
 				// Tell the UI what theme it is configured to use
 				var theme = getConfig('theme');
 				if (theme !== undefined) {
-					url += '&theme=' + encodeURIComponent(theme);
+					params += '&theme=' + encodeURIComponent(theme);
 				}
 				
-				url += "&v-appId=" + appId;
+				params += "&v-appId=" + appId;
 				
 				var extraParams = getConfig('extraParams')
 				if (extraParams !== undefined) {
-					url += extraParams;
+					params += extraParams;
 				}
 				
-				url += '&' + vaadin.getBrowserDetailsParameters(appId); 
-				
-				// Timestamp to avoid caching
-				url += '&v-' + (new Date()).getTime();
+				params += '&' + vaadin.getBrowserDetailsParameters(appId); 
 				
 				var r;
 				try {
@@ -168,7 +168,9 @@
 						}
 					}  
 				};
-				r.send(null);
+				// send parameters as POST data
+				r.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+				r.send(params);
 				
 				log('sending request to ', url);
 			};			
@@ -239,8 +241,8 @@
 		},
 		getBrowserDetailsParameters: function(parentElementId) {
 			// Screen height and width
-			var url = 'v-sh=' + window.screen.height;
-			url += '&v-sw=' + window.screen.width;
+			var params = 'v-sh=' + window.screen.height;
+			params += '&v-sw=' + window.screen.width;
 			
 			// Window height and width
 			var cw = 0;
@@ -254,12 +256,12 @@
 				cw = document.documentElement.clientWidth;
 				ch = document.documentElement.clientHeight;
 			}
-			url += '&v-cw=' + cw + '&v-ch=' + ch;
+			params += '&v-cw=' + cw + '&v-ch=' + ch;
 			
 
 			var d = new Date();
 			
-			url += '&v-curdate=' + d.getTime();
+			params += '&v-curdate=' + d.getTime();
 			
 			var tzo1 = d.getTimezoneOffset(); // current offset
 			var dstDiff = 0;
@@ -276,29 +278,29 @@
 			}
 
 			// Time zone offset
-			url += '&v-tzo=' + tzo1;
+			params += '&v-tzo=' + tzo1;
 			
 			// DST difference
-			url += '&v-dstd=' + dstDiff;
+			params += '&v-dstd=' + dstDiff;
 			
 			// Raw time zone offset
-			url += '&v-rtzo=' + rtzo;
+			params += '&v-rtzo=' + rtzo;
 			
 			// DST in effect?
-			url += '&v-dston=' + (tzo1 != rtzo);
+			params += '&v-dston=' + (tzo1 != rtzo);
 			
 			var pe = document.getElementById(parentElementId);
 			if (pe) {
-				url += '&v-vw=' + pe.offsetWidth;
-				url += '&v-vh=' + pe.offsetHeight;
+				params += '&v-vw=' + pe.offsetWidth;
+				params += '&v-vh=' + pe.offsetHeight;
 			}
 			
 			// Location
-			url += '&v-loc=' + encodeURIComponent(location.href);
+			params += '&v-loc=' + encodeURIComponent(location.href);
 
 			// Window name
 			if (window.name) {
-				url += '&v-wn=' + encodeURIComponent(window.name);
+				params += '&v-wn=' + encodeURIComponent(window.name);
 			}
 			
 			// Detect touch device support
@@ -313,10 +315,10 @@
 			}
 
 			if (supportsTouch) {
-				url += "&v-td=1";
+				params += "&v-td=1";
 			}
    	        
-	        return url;
+	        return params;
 		}
 	};