Enable to touch in Android native browser and Chrome #66
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,14 +6,26 @@ | |
| maxDoubleTapDelay = 350, | ||
| locations = {}, | ||
| taps = [], | ||
| 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; | ||
|
|
||
| ss.insertRule("div, img {-webkit-touch-callout:none;-webkit-tap-highlight-color:rgba(0,0,0,0);}", 0); | ||
| } | ||
|
|
||
| function isTouchable () { | ||
| if (MM._browser.touch) { | ||
| setCss(); | ||
| return true; | ||
| } else { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| function updateTouches(e) { | ||
|
|
@@ -23,11 +35,9 @@ | |
| var l = locations[t.identifier]; | ||
| l.x = t.clientX; | ||
| l.y = t.clientY; | ||
| } | ||
| else { | ||
| locations[t.identifier] = { | ||
| startPos: { x: t.clientX, y: t.clientY }, | ||
| x: t.clientX, | ||
| y: t.clientY, | ||
|
|
@@ -45,7 +55,10 @@ | |
| } | ||
|
|
||
| function touchStart(e) { | ||
| locations = {}; | ||
| updateTouches(e); | ||
| //MM.addEvent(window, 'touchmove', touchMove); | ||
| //MM.addEvent(window, 'touchend', touchEnd); | ||
| } | ||
|
|
||
| function touchMove(e) { | ||
|
|
@@ -63,6 +76,9 @@ | |
|
|
||
| function touchEnd(e) { | ||
| var now = new Date().getTime(); | ||
|
|
||
| //MM.removeEvent(window, 'touchmove', touchMove); | ||
| //MM.removeEvent(window, 'touchend', touchEnd); | ||
| // round zoom if we're done pinching | ||
| if (e.touches.length === 0 && wasPinching) { | ||
| onPinched(lastPinchCenter); | ||
|
|
@@ -160,16 +176,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 scale = Math.sqrt(Math.pow(p0.x - p1.x, 2) + Math.pow(p0.y - p1.y, 2)); | ||
|
There was a problem hiding this comment. Can this use MM.Point.dist instead? https://github.com/modestmaps/modestmaps-js/blob/master/src/point.js#L18 There was a problem hiding this comment. Sure. There was a problem hiding this comment. Sorry, I add all comments not by our group account but my own account. |
||
| var prevScale = Math.sqrt(Math.pow(l0.x - l1.x, 2) + Math.pow(l0.y - l1.y, 2)); | ||
|
|
||
| map.zoomByAbout( | ||
| Math.log(scale) / Math.LN2 - | ||
| Math.log(prevScale) / Math.LN2, | ||
| center ); | ||
|
|
||
| // pan from the previous center of these touches | ||
|
|
@@ -190,6 +209,7 @@ | |
| map.zoomByAbout(tz - z, p); | ||
| } | ||
| wasPinching = false; | ||
| locations = {}; | ||
| } | ||
|
|
||
| handler.init = function(x) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will change the style of all images and all divs: we can't do that. What divs is this style needed on?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is because, in Android native browser, touching to img or div makes their color flash, and keep touching long time, dialog of 'Save this image ?' will pop up.
To avoid them, I add this css.
I try to check tiles or map divs classes, and make not to change other imgs or divs's style.