Skip to content

Enable to touch in Android native browser and Chrome #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tilemapjp wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Enable to touch in Android native browser and Chrome #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4bd41e
Enable to touch in Android native browser and Chrome
kochizufan Mar 24, 2013
987f315
Fix flashing display when touches are started in Android native browser
kochizufan Mar 24, 2013
3317d82
Enable to touch in Android native browser and Chrome
kochizufan Mar 24, 2013
21bed61
Modified to submit tmcw's comment
kochizufan Mar 30, 2013
3117ec7
Merge branch 'android_touch' into android_touch_preq
kochizufan Mar 30, 2013
26d5b74
Remove comment
kochizufan Mar 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 113 additions & 11 deletions modestmaps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,92 @@ var MM = com.modestmaps = {
};

MM._browser = (function(window) {
/*
* Copy code from Leaflet's L.Browser, handles different browser and feature detections for internal Leaflet use.
*/

var ie = !!window.ActiveXObject,
ie6 = ie && !window.XMLHttpRequest,
ie7 = ie && !document.querySelector,

// terrible browser detection to work around Safari / iOS / Android browser bugs
ua = navigator.userAgent.toLowerCase(),
webkit = ('WebKitCSSMatrix' in window), //ua.indexOf('webkit') !== -1,
chrome = ua.indexOf('chrome') !== -1,
android = ua.indexOf('android') !== -1,
android23 = ua.search('android [23]') !== -1,

mobile = typeof orientation !== undefined + '',
msTouch = window.navigator && window.navigator.msPointerEnabled &&
window.navigator.msMaxTouchPoints,
retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
window.matchMedia('(min-resolution:144dpi)').matches),

doc = document.documentElement,
ie3d = ie && ('transition' in doc.style),
webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
gecko3d = 'MozPerspective' in doc.style,
opera3d = 'OTransition' in doc.style,
any3d = (ie3d || webkit3d || gecko3d || opera3d);

var touch = (function () {

var startName = 'ontouchstart';

// IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.MsTouch) or WebKit, etc.
if (msTouch || (startName in doc)) {
return true;
}

// Firefox/Gecko
var div = document.createElement('div'),
supported = false;

if (!div.setAttribute) {
return false;
}
div.setAttribute(startName, 'return;');

if (typeof div[startName] === 'function') {
supported = true;
}

div.removeAttribute(startName);
div = null;

return supported;
}());


return {
webkit: ('WebKitCSSMatrix' in window),
webkit3d: ('WebKitCSSMatrix' in window) && ('m11' in new WebKitCSSMatrix())
ie: ie,
ie6: ie6,
ie7: ie7,
webkit: webkit,

android: android,
android23: android23,

chrome: chrome,

ie3d: ie3d,
webkit3d: webkit3d,
gecko3d: gecko3d,
opera3d: opera3d,
any3d: any3d,

mobile: mobile,
mobileWebkit: mobile && webkit,
mobileWebkit3d: mobile && webkit3d,
mobileOpera: mobile && window.opera,

touch: touch,
msTouch: msTouch,

retina: retina
};

})(this); // use this for node.js global

MM.moveElement = function(el, point) {
Expand Down Expand Up @@ -1043,14 +1125,28 @@ var MM = com.modestmaps = {
maxDoubleTapDelay = 350,
locations = {},
taps = [],
snapToZoom = true,
snapToZoom = false,
wasPinching = false,
lastPinchCenter = null;

function setCss () {
var s = document.createElement('style');
s.setAttribute("type", "text/css");
document.getElementsByTagName('head').item(0).appendChild(s);
var ss = s.sheet;
var mapid = map.parent.id;

ss.insertRule("#" + mapid + " div {-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);}", 0);
ss.insertRule("#" + mapid + " {-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);}", 0);
}

function isTouchable () {
var el = document.createElement('div');
el.setAttribute('ongesturestart', 'return;');
return (typeof el.ongesturestart === 'function');
if (MM._browser.touch) {
setCss();
return true;
} else {
return false;
}
}

function updateTouches(e) {
Expand All @@ -1060,11 +1156,9 @@ var MM = com.modestmaps = {
var l = locations[t.identifier];
l.x = t.clientX;
l.y = t.clientY;
l.scale = e.scale;
}
else {
locations[t.identifier] = {
scale: e.scale,
startPos: { x: t.clientX, y: t.clientY },
x: t.clientX,
y: t.clientY,
Expand All @@ -1082,7 +1176,10 @@ var MM = com.modestmaps = {
}

function touchStart(e) {
locations = {};
updateTouches(e);
//MM.addEvent(window, 'touchmove', touchMove);
//MM.addEvent(window, 'touchend', touchEnd);
}

function touchMove(e) {
Expand All @@ -1100,6 +1197,7 @@ var MM = com.modestmaps = {

function touchEnd(e) {
var now = new Date().getTime();

// round zoom if we're done pinching
if (e.touches.length === 0 && wasPinching) {
onPinched(lastPinchCenter);
Expand Down Expand Up @@ -1197,16 +1295,19 @@ var MM = com.modestmaps = {
l0 = locations[t0.identifier],
l1 = locations[t1.identifier];

if (!l0 || !l1) return;
// mark these touches so they aren't used as taps/holds
l0.wasPinch = true;
l1.wasPinch = true;

// scale about the center of these touches
var center = MM.Point.interpolate(p0, p1, 0.5);
var center = MM.Point.interpolate(p0, p1, 0.5);
var scale = MM.Point.distance(p0, p1);
var prevScale = MM.Point.distance(l0, l1);

map.zoomByAbout(
Math.log(e.scale) / Math.LN2 -
Math.log(l0.scale) / Math.LN2,
Math.log(scale) / Math.LN2 -
Math.log(prevScale) / Math.LN2,
center );

// pan from the previous center of these touches
Expand All @@ -1227,6 +1328,7 @@ var MM = com.modestmaps = {
map.zoomByAbout(tz - z, p);
}
wasPinching = false;
locations = {};
}

handler.init = function(x) {
Expand Down
16 changes: 2 additions & 14 deletions modestmaps.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "modestmaps",
"description": "a display and interaction library for tile-based maps",
"version": "3.3.7-dev",
"version": "3.3.6",
"author": {
"name": "Tom Carden",
"email": "tom@tom-carden.co.uk",
Expand Down
36 changes: 27 additions & 9 deletions src/touch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,28 @@
maxDoubleTapDelay = 350,
locations = {},
taps = [],
snapToZoom = true,
snapToZoom = false,
wasPinching = false,
lastPinchCenter = null;

function setCss () {
var s = document.createElement('style');
s.setAttribute("type", "text/css");
document.getElementsByTagName('head').item(0).appendChild(s);
var ss = s.sheet;
var mapid = map.parent.id;

ss.insertRule("#" + mapid + " div {-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);}", 0);
ss.insertRule("#" + mapid + " {-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);}", 0);
}

function isTouchable () {
var el = document.createElement('div');
el.setAttribute('ongesturestart', 'return;');
return (typeof el.ongesturestart === 'function');
if (MM._browser.touch) {
setCss();
return true;
} else {
return false;
}
}

function updateTouches(e) {
Expand All @@ -23,11 +37,9 @@
var l = locations[t.identifier];
l.x = t.clientX;
l.y = t.clientY;
l.scale = e.scale;
}
else {
locations[t.identifier] = {
scale: e.scale,
startPos: { x: t.clientX, y: t.clientY },
x: t.clientX,
y: t.clientY,
Expand All @@ -45,6 +57,7 @@
}

function touchStart(e) {
locations = {};
updateTouches(e);
}

Expand All @@ -63,6 +76,7 @@

function touchEnd(e) {
var now = new Date().getTime();

// round zoom if we're done pinching
if (e.touches.length === 0 && wasPinching) {
onPinched(lastPinchCenter);
Expand Down Expand Up @@ -160,16 +174,19 @@
l0 = locations[t0.identifier],
l1 = locations[t1.identifier];

if (!l0 || !l1) return;
// mark these touches so they aren't used as taps/holds
l0.wasPinch = true;
l1.wasPinch = true;

// scale about the center of these touches
var center = MM.Point.interpolate(p0, p1, 0.5);
var center = MM.Point.interpolate(p0, p1, 0.5);
var scale = MM.Point.distance(p0, p1);
var prevScale = MM.Point.distance(l0, l1);

map.zoomByAbout(
Math.log(e.scale) / Math.LN2 -
Math.log(l0.scale) / Math.LN2,
Math.log(scale) / Math.LN2 -
Math.log(prevScale) / Math.LN2,
center );

// pan from the previous center of these touches
Expand All @@ -190,6 +207,7 @@
map.zoomByAbout(tz - z, p);
}
wasPinching = false;
locations = {};
}

handler.init = function(x) {
Expand Down
86 changes: 84 additions & 2 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,92 @@
};

MM._browser = (function(window) {
/*
* Copy code from Leaflet's L.Browser, handles different browser and feature detections for internal Leaflet use.
*/

var ie = !!window.ActiveXObject,
ie6 = ie && !window.XMLHttpRequest,
ie7 = ie && !document.querySelector,

// terrible browser detection to work around Safari / iOS / Android browser bugs
ua = navigator.userAgent.toLowerCase(),
webkit = ('WebKitCSSMatrix' in window), //ua.indexOf('webkit') !== -1,
chrome = ua.indexOf('chrome') !== -1,
android = ua.indexOf('android') !== -1,
android23 = ua.search('android [23]') !== -1,

mobile = typeof orientation !== undefined + '',
msTouch = window.navigator && window.navigator.msPointerEnabled &&
window.navigator.msMaxTouchPoints,
retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
window.matchMedia('(min-resolution:144dpi)').matches),

doc = document.documentElement,
ie3d = ie && ('transition' in doc.style),
webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
gecko3d = 'MozPerspective' in doc.style,
opera3d = 'OTransition' in doc.style,
any3d = (ie3d || webkit3d || gecko3d || opera3d);

var touch = (function () {

var startName = 'ontouchstart';

// IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.MsTouch) or WebKit, etc.
if (msTouch || (startName in doc)) {
return true;
}

// Firefox/Gecko
var div = document.createElement('div'),
supported = false;

if (!div.setAttribute) {
return false;
}
div.setAttribute(startName, 'return;');

if (typeof div[startName] === 'function') {
supported = true;
}

div.removeAttribute(startName);
div = null;

return supported;
}());


return {
webkit: ('WebKitCSSMatrix' in window),
webkit3d: ('WebKitCSSMatrix' in window) && ('m11' in new WebKitCSSMatrix())
ie: ie,
ie6: ie6,
ie7: ie7,
webkit: webkit,

android: android,
android23: android23,

chrome: chrome,

ie3d: ie3d,
webkit3d: webkit3d,
gecko3d: gecko3d,
opera3d: opera3d,
any3d: any3d,

mobile: mobile,
mobileWebkit: mobile && webkit,
mobileWebkit3d: mobile && webkit3d,
mobileOpera: mobile && window.opera,

touch: touch,
msTouch: msTouch,

retina: retina
};

})(this); // use this for node.js global

MM.moveElement = function(el, point) {
Expand Down