Merge pull request #257 from 2gis/fix/ie8-interactive-vml

Fix non-clickable VML layers in IE
2gis · Jun 25, 2015 · 058e188 · 058e188
2 parents 5671b84 + b92d95d
commit 058e188
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "html5shiv": "^3.7.2",
     "image-size": "0.3.5",
     "less": "^2.4.0",
-    "leaflet": "git://github.com/Leaflet/Leaflet.git#cc04a82be1d2bd830e2cdb5755013f510b089196",
+    "leaflet": "git://github.com/Leaflet/Leaflet.git#1bb1b5a3f8307b4460211f340281b764a24a13cc",
     "lodash": "^2.4.1",
     "map-stream": "0.1.0",
     "marked": "0.3.3",

diff --git a/src/DGGeoclicker/src/handler/CityArea.js b/src/DGGeoclicker/src/handler/CityArea.js
@@ -3,7 +3,6 @@ DG.Geoclicker.Handler.CityArea = DG.Geoclicker.Handler.Default.extend({
     _polylineStyleDefault : {
         fillColor: '#ff9387',
         color: '#ff9387',
-        clickable: false,
         noClip: true,
         opacity: 1
     },
@@ -45,22 +44,14 @@ DG.Geoclicker.Handler.CityArea = DG.Geoclicker.Handler.Default.extend({
 
         this._geometryZoomStyle = this._getPolyStyleNum();
         this._geometry = DG.Wkt.geoJsonLayer(results[type].geometry.selection, {
-            style: this._polylineStyles[this._geometryZoomStyle]
+            style: this._polylineStyles[this._geometryZoomStyle],
+            interactive: false
         }).addTo(this._map);
 
         this._map
             .on('zoomend', this._updateGeometry, this)
             .once('popupclose', this._clearPopup, this);
 
-        // We have to manually propagate clicks through the vector layer because
-        // VML doesn't support pointer-events: none
-        if (DG.Browser.ielt9) {
-            this._geometry.on('click', function (e) {
-                this._clearPopup();
-                this._map.fire('click', e);
-            }, this);
-        }
-
         return Promise.resolve(this._fillCityAreaObject(results, type));
     },