some cleanups to #746

plugins/draw-tools.user.js

@@ -2,7 +2,7 @@
 // @id             iitc-plugin-draw-tools@breunigs
 // @name           IITC plugin: draw tools
 // @category       Layer
-// @version        0.5.3.@@DATETIMEVERSION@@
+// @version        0.6.0.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@
@@ -32,11 +32,12 @@ window.plugin.drawTools.loadExternals = function() {
   $('head').append('<style>@@INCLUDESTRING:external/leaflet.draw.css@@</style>');
 }
 
-window.plugin.drawTools.setOptions = function(setcolor) {
+window.plugin.drawTools.setOptions = function(color) {
+  if (color === undefined) color = '#a24ac3';
 
   window.plugin.drawTools.lineOptions = {
     stroke: true,
-    color: setcolor,
+    color: color,
     weight: 4,
     opacity: 0.5,
     fill: false,
@@ -62,7 +63,7 @@ window.plugin.drawTools.setOptions = function(setcolor) {
 
 
 // renders the draw control buttons in the top left corner
-window.plugin.drawTools.DrawControl = function() {
+window.plugin.drawTools.addDrawControl = function() {
   var drawControl = new L.Control.Draw({
     draw: {
       rectangle: false,
@@ -124,9 +125,8 @@ window.plugin.drawTools.DrawControl = function() {
     },
 
   });
-  return drawControl;
-
 
+  map.addControl(drawControl);
 //  plugin.drawTools.addCustomButtons();
 }
 
@@ -196,27 +196,19 @@ window.plugin.drawTools.load = function() {
     var layer = null;
     switch(item.type) {
       case 'polyline':
-        if (typeof item.color === 'undefined'){
+        window.plugin.drawTools.setOptions(item.color);
-        window.plugin.drawTools.setOptions('#a24ac3');
-        }else{
-        window.plugin.drawTools.setOptions(item.color);}
         layer = L.geodesicPolyline(item.latLngs,window.plugin.drawTools.lineOptions);
         break;
       case 'polygon':
-        if (typeof item.color === 'undefined'){
+        window.plugin.drawTools.setOptions(item.color);
-        window.plugin.drawTools.setOptions('#a24ac3');
-        }else{
-        window.plugin.drawTools.setOptions(item.color);}
         layer = L.geodesicPolygon(item.latLngs,window.plugin.drawTools.polygonOptions);
         break;
       case 'circle':
-        if (typeof item.color === 'undefined'){
+        window.plugin.drawTools.setOptions(item.color);
-        window.plugin.drawTools.setOptions('#a24ac3');
-        }else{
-        window.plugin.drawTools.setOptions(item.color);}
         layer = L.geodesicCircle(item.latLng,item.radius,window.plugin.drawTools.polygonOptions);
         break;
       case 'marker':
+        // TODO? marker colours
         layer = L.marker(item.latLng,window.plugin.drawTools.markerOptions)
         break;
       default:
@@ -232,6 +224,7 @@ window.plugin.drawTools.load = function() {
 }
 
 //Draw Tools Options
+
 // Manual import, export and reset data
 window.plugin.drawTools.manualOpt = function() {
   dialog({
@@ -248,7 +241,8 @@ window.plugin.drawTools.load = function() {
 
 window.plugin.drawTools.optCopy = function() {
     dialog({
-        html: '<p><a onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea\').select();">Select all</a> and press CTRL+C to copy it.</p><textarea readonly>'+localStorage['plugin-draw-tools-layer']+'</textarea>',
+      html: '<p><a onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea\').select();">Select all</a> and press CTRL+C to copy it.</p><textarea readonly onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea\').select();">'+localStorage['plugin-draw-tools-layer']+'</textarea>',
+      width: 600,
       dialogClass: 'ui-dialog-drawtoolsSet-copy',
       title: 'Draw Tools Export'
     });
@@ -266,8 +260,8 @@ window.plugin.drawTools.load = function() {
 }
 
 window.plugin.drawTools.optReset = function() {
-    var promptAction = prompt('All drawn items will be deleted. Are you sure? [Y/N]', '');
+  var promptAction = confirm('All drawn items will be deleted. Are you sure?', '');
-    if(promptAction !== null && (promptAction === 'Y' || promptAction === 'y')) {
+  if(promptAction) {
     delete localStorage['plugin-draw-tools-layer'];
     window.plugin.drawTools.drawnItems.clearLayers();
     window.plugin.drawTools.load();
@@ -279,17 +273,14 @@ window.plugin.drawTools.load = function() {
 window.plugin.drawTools.optColor = function() {
   var promptAction = prompt('Current Color is '+window.plugin.drawTools.lineOptions.color, '');
   if(promptAction !== null && promptAction !== '') {
-      plugin.drawTools.controller.removeFrom(map);
     window.plugin.drawTools.setOptions(promptAction);
-plugin.drawTools.controller = plugin.drawTools.DrawControl();
-  plugin.drawTools.controller.addTo(map);
     console.log('DRAWTOOLS: color changed');
     window.plugin.drawTools.optAlert('Color Changed. ');
   }
 }
 
 window.plugin.drawTools.boot = function() {
-  window.plugin.drawTools.setOptions('#a24ac3');
+  window.plugin.drawTools.setOptions();
 
   //create a leaflet FeatureGroup to hold drawn items
   window.plugin.drawTools.drawnItems = new L.FeatureGroup();
@@ -298,8 +289,7 @@ window.plugin.drawTools.boot = function() {
   plugin.drawTools.load();
 
   //add the draw control - this references the above FeatureGroup for editing purposes
-  plugin.drawTools.controller = plugin.drawTools.DrawControl();
+  plugin.drawTools.addDrawControl();
-  plugin.drawTools.controller.addTo(map);
 
   //start off hidden. if the layer is enabled, the below addLayerGroup will add it, triggering a 'show'
   $('.leaflet-draw-section').hide();
@@ -344,9 +334,10 @@ window.plugin.drawTools.boot = function() {
                         +'<a onclick="window.plugin.drawTools.optPaste();return false;">Paste/Import Drawn Items</a>'
                         +'<a onclick="window.plugin.drawTools.optReset();return false;">Reset Drawn Items</a>'
                         +'</div>';
+
   $('head').append('<style>' +
         '#drawtoolsSetbox a { display:block; color:#ffce00; border:1px solid #ffce00; padding:3px 0; margin:10px auto; width:80%; text-align:center; background:rgba(8,48,78,.9); }'+
-        '.ui-dialog-drawtoolsSet-copy textarea{width:96%; height:120px; resize:vertical;}'+
+        '.ui-dialog-drawtoolsSet-copy textarea { width:96%; height:250px; resize:vertical; }'+
         '</style>');
 
 }