projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9aaa207
)
Roo.js
author
Alan Knowles
<alan@roojs.com>
Fri, 30 Sep 2016 02:55:20 +0000
(10:55 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 30 Sep 2016 02:55:20 +0000
(10:55 +0800)
Roo.js
patch
|
blob
|
history
diff --git
a/Roo.js
b/Roo.js
index
90a960a
..
d9ededc
100644
(file)
--- a/
Roo.js
+++ b/
Roo.js
@@
-65,7
+65,10
@@
Roo.apply = function(o, c, defaults){
isSecure = window.location.href.toLowerCase().indexOf("https") === 0,
isIOS = /iphone|ipad/.test(ua),
isTouch = (function() {
isSecure = window.location.href.toLowerCase().indexOf("https") === 0,
isIOS = /iphone|ipad/.test(ua),
isTouch = (function() {
- try {
+ try {
+ if (ua.indexOf('chrome') != -1 && ua.indexOf('android') == -1) {
+ return false; // no touch on chrome!?
+ }
document.createEvent("TouchEvent");
return true;
} catch (e) {
document.createEvent("TouchEvent");
return true;
} catch (e) {