Changeset 32769 for main/trunk/greenstone3/web/interfaces/default/js/map-scripts-editor.js

Timestamp:

2019-02-12T12:44:28+13:00 (5 years ago)

Author:

ak19

Message:

Map editor history changed into an object prototype (class).

File:

• main/trunk/greenstone3/web/interfaces/default/js/map-scripts-editor.js (modified) (18 diffs)

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

@@ -176 +176 @@
             if (resizable) {
                 if(dontResize == false){
-                    historyOverlayPush();
+                    mapEditorHistory.historyOverlayPush();
                 }
                 
@@ -187 +187 @@
 
     if (selectedShapes.length > 0) {
-        historyOverlayPush();
+        mapEditorHistory.historyOverlayPush();
     }
 }
@@ -193 +193 @@
 function shapeSpecsChangeMU() {
     if (selectedShapes.length > 0) {
-        presentOverlayPush();
+        mapEditorHistory.presentOverlayPush ();
     }
 }
@@ -309 +309 @@
     google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) {
         allowDeselect = true;
-        historyOverlayPush();
+        mapEditorHistory.historyOverlayPush();
         overlays.push(e.overlay); // store reference to added overlay
         var newShape = e.overlay;
         newShape.type = e.type;
-        presentOverlayPush();
+        mapEditorHistory.presentOverlayPush();
 
         if (e.type !== google.maps.drawing.OverlayType.MARKER) {
@@ -348 +348 @@
     document.addEventListener('keydown', function () {
         if (event.code == 'KeyY' && (event.ctrlKey || event.metaKey) || (event.code == 'KeyZ' && event.code == 'ShiftLeft' && (event.ctrlKey || event.metaKey))) {
-            redo();
+            mapEditorHistory.redo();
         }
         if (event.code == 'KeyZ' && (event.ctrlKey || event.metaKey)) {
             if (shiftKeyPressed == false) {
-                undo();
-                mapEditorHistory.undo(overlays); // ***** when we only have MapEditorHistory as a class
+                //undo();
+                mapEditorHistory.undo();
+                //mapEditorHistory.undo(overlays, draggableState); // ***** when we only have MapEditorHistory as a class
                 //that.mapEditorHistory.undo(that.overlays); // ***** when we have both MapEditorHistory and MapEditor as classes
                 
@@ -436 +437 @@
     google.maps.event.addListener(newShape, 'dragstart', function (e) {
         beingDragged = true;
-        historyOverlayPush();
+        mapEditorHistory.historyOverlayPush();
 
     });
@@ -442 +443 @@
     google.maps.event.addListener(newShape, 'dragend', function () {
         beingDragged = false;
-        presentOverlayPush();
+        mapEditorHistory.presentOverlayPush ();
         allowDeselect = false;
     });
@@ -458 +459 @@
     google.maps.event.addListener(newShape, 'dragstart', function (e) {
         allowDeselect = false;
-        historyOverlayPush();
+        mapEditorHistory.historyOverlayPush();
     });
 
@@ -465 +466 @@
     google.maps.event.addListener(newShape, 'dragend', function () {
         beingDragged = false;
-        presentOverlayPush();
+        mapEditorHistory.presentOverlayPush ();
         settingThePath();
         
@@ -475 +476 @@
     google.maps.event.addListener(newShape, 'bounds_changed', function (e) {
         if (beingDragged == false) {
-            presentOverlayPush();
+            mapEditorHistory.presentOverlayPush ();
         }
     });
@@ -485 +486 @@
         }
         if (e.vertex !== undefined || e.edge !== undefined) {
-            historyOverlayPush()
+            mapEditorHistory.historyOverlayPush()
         }
         if (drawingManager.drawingMode == null) {
@@ -494 +495 @@
     google.maps.event.addListener(newShape, 'mouseup', function (e) {
         if (e.vertex !== undefined || e.edge !== undefined) {
-            presentOverlayPush()
+            mapEditorHistory.presentOverlayPush ()
         } else {
             //setSelection(newShape, e);
@@ -572 +573 @@
 function setSelectedThickness(sWeight) {
     if (selectedShapes.length > 0) {
-        //historyOverlayPush();
+        //mapEditorHistory.historyOverlayPush();
         for (var i = 0; i < selectedShapes.length; i++) {
             selectedShapes[i].set('strokeWeight', sWeight);
@@ -636 +637 @@
 
 function printHistory() {
-    console.log("prev", prevOverlays);
-    console.log("present ", presentOverlays);
-    console.log("undone ", undoneOverlays);
+    console.log("prev", mapEditorHistory.prevOverlays);
+    console.log("present ", mapEditorHistory.presentOverlays);
+    console.log("undone ", mapEditorHistory.undoneOverlays);
     console.log(mouseState);
 }
@@ -668 +669 @@
 function deleteSelectedShape() {
     //console.log("this fires");
-    historyOverlayPush();
+    mapEditorHistory.historyOverlayPush();
     for (var i = 0; i < selectedShapes.length; i++) {
         selectedShapes[i].setMap(null);
@@ -680 +681 @@
     selectedShapes = [];
     //console.log("this fires");
-    presentOverlayPush();
+    mapEditorHistory.presentOverlayPush ();
 }
 
@@ -686 +687 @@
     console.log(nId);
     //console.log("this fires");
-    historyOverlayPush();
+    mapEditorHistory.historyOverlayPush();
     for (var i = 0; i < overlays.length; i++) {
         overlays[i].setMap(null);
@@ -692 +693 @@
     overlays = [];
     //console.log("this fires");
-    presentOverlayPush();
-}
+    mapEditorHistory.presentOverlayPush ();
+}