Changeset 32850 for main/trunk/greenstone3/web/interfaces/default/js/map-scripts-shapes-util.js

Timestamp:

2019-03-04T16:30:56+13:00 (5 years ago)

Author:

ak19

Message:

1. Zeddy introduces suppressUndo and cleaned up lots of CloneShape sectionst that were commented out. 2. Zeddy and Dr Bainbridge solved the issue whereby shapes loaded from archives_metadata were not selectable and needed a deleteAllShapes followed by Undo to make them selectable. These steps are no longer needed now, as it's solved more efficiently.

File:

• main/trunk/greenstone3/web/interfaces/default/js/map-scripts-shapes-util.js (modified) (5 diffs)

main/trunk/greenstone3/web/interfaces/default/js/map-scripts-shapes-util.js

@@ -64 +64 @@
         
         clone_poly = new google.maps.Polyline({
+            suppressUndo: true,
             geodesic:      geodesic,
             strokeColor:   strokeColor,
@@ -80 +81 @@
     
         clone_poly = new google.maps.Polygon({
+            suppressUndo: true,
             geodesic:      geodesic,
             strokeColor:   strokeColor,
@@ -186 +188 @@
     
     var clone_rect = new google.maps.Rectangle({
-            strokeColor: strokeColor,
-            strokeOpacity: strokeOpacity,
-            strokeWeight: strokeWeight,
-            fillColor: fillColor,
-            fillOpacity: fillOpacity,
-            bounds: bounds,
-            draggable: true,
-            editable: false,
-            type: type
-        });
+        suppressUndo: true,
+        strokeColor: strokeColor,
+        strokeOpacity: strokeOpacity,
+        strokeWeight: strokeWeight,
+        fillColor: fillColor,
+        fillOpacity: fillOpacity,
+        bounds: bounds,
+        draggable: true,
+        editable: false,
+        type: type
+    });
     return clone_rect;
 }
@@ -267 +270 @@
     
     var clone_circ = new google.maps.Circle({
-            strokeColor: strokeColor,
-            strokeOpacity: strokeOpacity,
-            strokeWeight: strokeWeight,
-            fillColor: fillColor,
-            fillOpacity: fillOpacity,
-            center: center,
-            radius: radius,
-            draggable: true,
-            editable: false,
-            type: type
-        });
+        suppressUndo: true,
+        strokeColor: strokeColor,
+        strokeOpacity: strokeOpacity,
+        strokeWeight: strokeWeight,
+        fillColor: fillColor,
+        fillOpacity: fillOpacity,
+        center: center,
+        radius: radius,
+        draggable: true,
+        editable: false,
+        type: type
+    });
     return clone_circ;
 }
@@ -320 +324 @@
     
     var clone_marker = new google.maps.Marker({
-            position: position,
-            clickable: true,
-            draggable: true,
-            editable: true,
-            type: google.maps.drawing.OverlayType.MARKER
-        })
+        suppressUndo: true,
+        position: position,
+        clickable: true,
+        draggable: true,
+        editable: true,
+        type: google.maps.drawing.OverlayType.MARKER
+    })
     return clone_marker;
 }