enabled touch scrolling for embedded HTML components

qooxdoo · Dec 11, 2014 · f383bf1 · f383bf1
1 parent e351ad6
commit f383bf1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/application/demobrowser/source/class/demobrowser/DemoBrowser.js b/application/demobrowser/source/class/demobrowser/DemoBrowser.js
@@ -819,6 +819,10 @@ qx.Class.define("demobrowser.DemoBrowser",
       this.widgets["outputviews.sourcepage.html.page"] = f3;
 
       f3.getContentElement().setAttribute("id", "qx_srcview");
+      if (qx.core.Environment.get("device.type") !== "desktop") {
+        f3.getContentElement().setStyle("WebkitOverflowScrolling", "touch");
+        f3.getContentElement().setStyle("touchAction", "auto");
+      }
 
       return f3;
     },
@@ -832,6 +836,10 @@ qx.Class.define("demobrowser.DemoBrowser",
       this.widgets["outputviews.sourcepage.js.page"] = f4;
 
       f4.getContentElement().setAttribute("id", "qx_srcview");
+      if (qx.core.Environment.get("device.type") !== "desktop") {
+        f4.getContentElement().setStyle("WebkitOverflowScrolling", "touch");
+        f4.getContentElement().setStyle("touchAction", "auto");
+      }
 
       return f4;
     },

diff --git a/application/feedreader/source/class/feedreader/view/desktop/Article.js b/application/feedreader/source/class/feedreader/view/desktop/Article.js
@@ -48,7 +48,11 @@ qx.Class.define("feedreader.view.desktop.Article",
     // Configure
     this.setCssClass("blogEntry");
     this.setOverflowY("auto");
-    this.getContentElement().setStyle("WebkitOverflowScrolling", "touch");
+    if (qx.core.Environment.get("device.type") !== "desktop") {
+      this.getContentElement().setStyle("WebkitOverflowScrolling", "touch");
+      this.getContentElement().setStyle("touchAction", "auto");
+    }
+
     this.setBackgroundColor("white");
   },