draw-tools: fix mobile-related bugs; add Circle again

fix iitc-project/ingress-intel-total-conversion#1294 fix IITC-CE#162 upstream report: Leaflet/Leaflet.draw#923
johnd0e · Apr 25, 2019 · ae6de54 · ae6de54
1 parent 7151b4f
commit ae6de54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/mobile/smartphone.css b/mobile/smartphone.css
@@ -225,8 +225,3 @@ body {
   border: 1px outset #20A8B1;
   margin-top: 2px;
 }
-
-/* Hide drawtools circle on mobile */
-.leaflet-draw-draw-circle {
-  display: none !important;
-}
diff --git a/plugins/draw-tools.user.js b/plugins/draw-tools.user.js
@@ -100,7 +100,6 @@ window.plugin.drawTools.addDrawControl = function() {
       },
 
       circle: {
-        circlemarker: false,
         shapeOptions: window.plugin.drawTools.polygonOptions,
         snapPoint: window.plugin.drawTools.getSnapLatLng,
       },
@@ -584,6 +583,11 @@ window.plugin.drawTools.snapToPortals = function() {
 }
 
 window.plugin.drawTools.boot = function() {
+
+  // https://github.com/Leaflet/Leaflet.draw/issues/923
+  map.options.touchExtend = true;
+  map.addHandler('touchExtend', L.Map.TouchExtend);
+
   // add a custom hook for draw tools to share it's activity with other plugins
   pluginCreateHook('pluginDrawTools');