Skip to content

Commit

Permalink
Support 'tap' map option
Browse files Browse the repository at this point in the history
This option is required to support disabling of scrolling on mobile
devices.  See Leaflet/Leaflet#2031 for
more details
  • Loading branch information
rckclmbr committed Jan 20, 2015
1 parent 0cb0165 commit 256011b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
3 changes: 3 additions & 0 deletions dist/angular-leaflet-directive.js
Expand Up @@ -1719,6 +1719,7 @@ angular.module("leaflet-directive").factory('leafletMapDefaults', ["$q", "leafle
worldCopyJump: false,
doubleClickZoom: true,
scrollWheelZoom: true,
tap: true,
touchZoom: true,
zoomControl: true,
zoomsliderControl: false,
Expand Down Expand Up @@ -1772,6 +1773,7 @@ angular.module("leaflet-directive").factory('leafletMapDefaults', ["$q", "leafle
zoomControl: d.zoomControl,
doubleClickZoom: d.doubleClickZoom,
scrollWheelZoom: d.scrollWheelZoom,
tap: d.tap,
touchZoom: d.touchZoom,
attributionControl: d.attributionControl,
worldCopyJump: d.worldCopyJump,
Expand Down Expand Up @@ -1809,6 +1811,7 @@ angular.module("leaflet-directive").factory('leafletMapDefaults', ["$q", "leafle
if (isDefined(userDefaults)) {
newDefaults.doubleClickZoom = isDefined(userDefaults.doubleClickZoom) ? userDefaults.doubleClickZoom : newDefaults.doubleClickZoom;
newDefaults.scrollWheelZoom = isDefined(userDefaults.scrollWheelZoom) ? userDefaults.scrollWheelZoom : newDefaults.doubleClickZoom;
newDefaults.tap = isDefined(userDefaults.tap) ? userDefaults.tap : newDefaults.tap;
newDefaults.touchZoom = isDefined(userDefaults.touchZoom) ? userDefaults.touchZoom : newDefaults.doubleClickZoom;
newDefaults.zoomControl = isDefined(userDefaults.zoomControl) ? userDefaults.zoomControl : newDefaults.zoomControl;
newDefaults.zoomsliderControl = isDefined(userDefaults.zoomsliderControl) ? userDefaults.zoomsliderControl : newDefaults.zoomsliderControl;
Expand Down
4 changes: 2 additions & 2 deletions dist/angular-leaflet-directive.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc/defaults-attribute.md
Expand Up @@ -18,6 +18,7 @@ We can define some specific parameters that apply to the Leaflet map creation. O
* [zoomControl](http://leafletjs.com/reference.html#map-zoomcontrol). *Boolean*. Put the zoom control on the map or not.
* [doubleClickZoom](http://leafletjs.com/reference.html#map-doubleclickzoom). *Boolean*. Allows to zoom with the double-click mouse action.
* [scrollWheelZoom](http://leafletjs.com/reference.html#map-scrollwheelzoom). *Boolean*. Allows to zoom with the mouse wheel.
* [tap](http://leafletjs.com/reference.html#map-tap). *Boolean*. Enables mobile hacks for supporting instant taps (fixing 200ms click delay on iOS/Android) and touch holds (fired as contextmenu events).
* [attributionControl](http://leafletjs.com/reference.html#map-attributioncontrol). *Boolean*. Shows or hides the attribution text control.
* [zoomAnimation](http://leafletjs.com/reference.html#map-zoomanimation). *Boolean*. Animate the zoom action or not.
* [fadeAnimation](http://leafletjs.com/reference.html#map-fadeanimation). *Boolean*. Enable/disable the tile fade animation.
Expand Down
3 changes: 3 additions & 0 deletions src/services/leafletMapDefaults.js
Expand Up @@ -6,6 +6,7 @@ angular.module("leaflet-directive").factory('leafletMapDefaults', function ($q,
worldCopyJump: false,
doubleClickZoom: true,
scrollWheelZoom: true,
tap: true,
touchZoom: true,
zoomControl: true,
zoomsliderControl: false,
Expand Down Expand Up @@ -59,6 +60,7 @@ angular.module("leaflet-directive").factory('leafletMapDefaults', function ($q,
zoomControl: d.zoomControl,
doubleClickZoom: d.doubleClickZoom,
scrollWheelZoom: d.scrollWheelZoom,
tap: d.tap,
touchZoom: d.touchZoom,
attributionControl: d.attributionControl,
worldCopyJump: d.worldCopyJump,
Expand Down Expand Up @@ -96,6 +98,7 @@ angular.module("leaflet-directive").factory('leafletMapDefaults', function ($q,
if (isDefined(userDefaults)) {
newDefaults.doubleClickZoom = isDefined(userDefaults.doubleClickZoom) ? userDefaults.doubleClickZoom : newDefaults.doubleClickZoom;
newDefaults.scrollWheelZoom = isDefined(userDefaults.scrollWheelZoom) ? userDefaults.scrollWheelZoom : newDefaults.doubleClickZoom;
newDefaults.tap = isDefined(userDefaults.tap) ? userDefaults.tap : newDefaults.tap;
newDefaults.touchZoom = isDefined(userDefaults.touchZoom) ? userDefaults.touchZoom : newDefaults.doubleClickZoom;
newDefaults.zoomControl = isDefined(userDefaults.zoomControl) ? userDefaults.zoomControl : newDefaults.zoomControl;
newDefaults.zoomsliderControl = isDefined(userDefaults.zoomsliderControl) ? userDefaults.zoomsliderControl : newDefaults.zoomsliderControl;
Expand Down

0 comments on commit 256011b

Please sign in to comment.