Merge pull request #1044 from resetnow/basicui-rollershutter-touch-ev…

…ents BasicUI: adjust rollershutter widget event handlers, fixes #1020
eclipse-archived · Feb 15, 2016 · f57b1d7 · f57b1d7
2 parents 079533e + 945e983
commit f57b1d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/extensions/ui/org.eclipse.smarthome.ui.basic/web-src/smarthome.js b/extensions/ui/org.eclipse.smarthome.ui.basic/web-src/smarthome.js
@@ -513,17 +513,20 @@
 			}));
 		}
 
-		function onMouseDown(command) {
+		function onMouseDown(command, event) {
 			longPress = false;
 			pressed = true;
 
 			timeout = setTimeout(function() {
 				longPress = true;
 				emitEvent(command);
 			}, longpressTimeout);
+
+			event.stopPropagation();
+			event.preventDefault();
 		}
 
-		function onMouseUp(command) {
+		function onMouseUp(command, event) {
 			clearTimeout(timeout);
 			if (!pressed) {
 				return;
@@ -535,10 +538,16 @@
 			} else {
 				emitEvent(command);
 			}
+
+			event.stopPropagation();
+			event.preventDefault();
 		}
 
-		function onStop() {
+		function onStop(event) {
 			emitEvent("STOP");
+
+			event.stopPropagation();
+			event.preventDefault();
 		}
 
 		var