소스 검색

HUE-6228 [core] Disable touchscreen detection on Nicescroll

Enrico Berti 8 년 전
부모
커밋
94ff4db008
1개의 변경된 파일12개의 추가작업 그리고 13개의 파일을 삭제
  1. 12 13
      desktop/core/src/desktop/static/desktop/js/jquery.nicescroll.js

+ 12 - 13
desktop/core/src/desktop/static/desktop/js/jquery.nicescroll.js

@@ -14,6 +14,15 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 
 
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//
+// THIS IS A MODIFIED VERSION OF THE PLUGIN
+// it has a proper management of debouncing and disables touchscreens handling
+//
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
 /* jquery.nicescroll
 /* jquery.nicescroll
 -- version 3.6.8
 -- version 3.6.8
 -- copyright 2016-02-29 InuYaksa*2016
 -- copyright 2016-02-29 InuYaksa*2016
@@ -173,9 +182,9 @@
     d.ischrome22 = (!d.ischrome38)&&(d.ischrome && d.haspointerlock);
     d.ischrome22 = (!d.ischrome38)&&(d.ischrome && d.haspointerlock);
     d.ischrome26 = (!d.ischrome38)&&(d.ischrome && ("transition" in _style)); // issue with transform detection (maintain prefix)
     d.ischrome26 = (!d.ischrome38)&&(d.ischrome && ("transition" in _style)); // issue with transform detection (maintain prefix)
 
 
-    d.cantouch = ("ontouchstart" in document.documentElement) || ("ontouchstart" in window); // with detection for Chrome Touch Emulation
-    d.hasw3ctouch = (window.PointerEvent || false) && ((navigator.MaxTouchPoints > 0)||(navigator.msMaxTouchPoints > 0)); //IE11 pointer events, following W3C Pointer Events spec
-    d.hasmstouch = (!d.hasw3ctouch)&&(window.MSPointerEvent || false); // IE10 pointer events
+    d.cantouch = false; // note: disabled all touchscreens because of several customers' problems with touchscreens
+    d.hasw3ctouch = false;
+    d.hasmstouch = false;
 
 
     d.ismac = /^mac$/i.test(_platform);
     d.ismac = /^mac$/i.test(_platform);
 
 
@@ -414,16 +423,6 @@
 
 
     this.istouchcapable = false; // desktop devices with touch screen support
     this.istouchcapable = false; // desktop devices with touch screen support
 
 
-    //## Check WebKit-based desktop with touch support
-    //## + Firefox 18 nightly build (desktop) false positive (or desktop with touch support)
-
-    if (!cap.cantouch && (cap.hasw3ctouch||cap.hasmstouch)) {  // desktop device with multiple input
-      this.istouchcapable = true;
-    } else if (cap.cantouch && !cap.isios && !cap.isandroid && (cap.iswebkit || cap.ismozilla)) {
-      this.istouchcapable = true;
-//      cap.cantouch = false; // parse normal desktop events
-    }
-
     //## disable MouseLock API on user request
     //## disable MouseLock API on user request
     if (!self.opt.enablemouselockapi) {
     if (!self.opt.enablemouselockapi) {
       cap.hasmousecapture = false;
       cap.hasmousecapture = false;