Changeset 33085 for main

Timestamp:

2019-05-16T20:07:50+12:00 (5 years ago)

Author:

wy59

Message:

1. Labels sort of work (see point 2) and get saved and reloaded from archives too now. 2. Needs fixing: undo and redo in label field works only if you enter the text first before drawing the shape, whereas vice-versa the redo/undo behaviour is weird (label repeated 3 times).

File:

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

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

@@ -145 +145 @@
     var mvc_path = ShapesUtil.arrayPathToMVCArrayPath(json_path);
     
-    var polyline = ShapesUtil._createPoly(google.maps.drawing.OverlayType.POLYLINE,json_polyline,mvc_path);
+    var polyline = ShapesUtil._createPoly(google.maps.drawing.OverlayType.POLYLINE, json_polyline, mvc_path);   
     return polyline;
 }
@@ -369 +369 @@
 
 
-ShapesUtil.cloneShape = function (shape) {
+ShapesUtil.cloneShape = function (shape) {    
     if (shape.type === google.maps.drawing.OverlayType.POLYLINE) {
-        var clone_polyline = ShapesUtil.clonePolyline(shape);
+        var clone_polyline = ShapesUtil.clonePolyline(shape);
+        clone_polyline.description = shape.description;
         return clone_polyline;
     } else if (shape.type === google.maps.drawing.OverlayType.POLYGON) {
-        var clone_polygon = ShapesUtil.clonePolygon(shape);
+        var clone_polygon = ShapesUtil.clonePolygon(shape);
+        clone_polygon.description = shape.description;
         return clone_polygon;
     } else if (shape.type === google.maps.drawing.OverlayType.RECTANGLE) {
-        var clone_rect = ShapesUtil.cloneRectangle(shape);
-        return clone_rect;
-
+        var clone_rect = ShapesUtil.cloneRectangle(shape);
+        clone_rect.description = shape.description;
+        return clone_rect;      
     } else if (shape.type === google.maps.drawing.OverlayType.CIRCLE) {
-        var clone_circ = ShapesUtil.cloneCircle(shape);
+        var clone_circ = ShapesUtil.cloneCircle(shape);
+        clone_circ.description = shape.description;
         return clone_circ;
 
     } else {
-        var clone_marker = ShapesUtil.cloneMarker(shape);
+        var clone_marker = ShapesUtil.cloneMarker(shape);
+        clone_marker.description = shape.description;
         return clone_marker;
     }
@@ -421 +425 @@
     }
     
+    json_shape.description = shape.description;
     return json_shape;
 }
@@ -459 +464 @@
     }
     
+    shape.description = json_shape.description;
     return shape;
 }