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

Timestamp:

2019-03-01T18:23:58+13:00 (5 years ago)

Author:

ak19

Message:

Zeddy map work. 1. Now supports saving when map editor is selected and key s is pressed.. The saved shapes are now reloaded on page (re)load. 2. If you make a change and didn't save it and try to leave the page, there's now a default warning (can't yet control the warning message, but it's helpful enough at this stage). 3. Some more fixes. 4. Some cleaning up of unused code. 5. Still some debugging statements left in, check for console.log() for instance. 6. Gone back to using javascript instead of jQuery for keyboard shortcuts so it will work for PDF docs too, but kept some additional changes made earlier so that things still work on Firefox besides Chrome.

File:

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

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

@@ -10 +10 @@
 MapEditorHistory.prototype.undo = function () {
     
-    for (var i = 0; i < this.mapEditor.overlays.length; i++) {
-        this.mapEditor.overlays[i].setMap(null);
-    }
+    
     if (this.prevOverlays.length != 0) {
+        for (var i = 0; i < this.mapEditor.overlays.length; i++) {
+            this.mapEditor.overlays[i].setMap(null);
+        }
+        
         this.mapEditor.selectedShapes = [];
         this.mapEditor.overlays = [];
@@ -34 +36 @@
 
     if (this.undoneOverlays.length != 0) {
-        var draggableCB = document.querySelector("input[name=draggableCB]").checked = false;
-        this.mapEditor.selectedShapes = [];
-        for (var i = 0; i < this.mapEditor.overlays.length; i++) {
-            this.mapEditor.overlays[i].setMap(null);
-        }
-
-        this.mapEditor.overlays = [];
-        var lastEntry = this.undoneOverlays[this.undoneOverlays.length - 1];
-        for (var i = 0; i < lastEntry.length; i++) {
-            this.mapEditor.overlays[i] = lastEntry[i];
-            this.mapEditor.overlays[i].setMap(this.mapEditor.map);
-            this.mapEditor.overlays[i].draggable = true;
-        }
-
-        var conditionPrevious = this.presentOverlays[0];
-        if (conditionPrevious !== undefined) {
-            if (conditionPrevious.length == 0) {
-                this.prevOverlays.push(this.presentOverlays[0]);
-            } else {
-                var overlays_copy = [];
-                for (var i = 0; i < this.presentOverlays[0].length; i++) {
-                    var clone_shape = ShapesUtil.cloneShape(this.presentOverlays[0][i]);
-                    if (ShapesUtil.overlayItemIsShape(clone_shape)) {
-                        this.mapEditor.addShapeListeners(clone_shape, null);
-                    } else {
-                        this.mapEditor.addMarkerListeners(clone_shape, null);
+        if (this.undoneOverlays[this.undoneOverlays.length -1].length != 0) {
+            var draggableCB = document.querySelector("input[name=draggableCB]").checked = false;
+            this.mapEditor.selectedShapes = [];
+            for (var i = 0; i < this.mapEditor.overlays.length; i++) {
+                this.mapEditor.overlays[i].setMap(null);
+            }
+
+            this.mapEditor.overlays = [];
+            var lastEntry = this.undoneOverlays[this.undoneOverlays.length - 1];
+            for (var i = 0; i < lastEntry.length; i++) {
+                this.mapEditor.overlays[i] = lastEntry[i];
+                this.mapEditor.overlays[i].setMap(this.mapEditor.map);
+                this.mapEditor.overlays[i].draggable = true;
+            }
+
+            var conditionPrevious = this.presentOverlays[0];
+            if (conditionPrevious !== undefined) {
+                if (conditionPrevious.length == 0) {
+                    this.prevOverlays.push(this.presentOverlays[0]);
+                } else {
+                    var overlays_copy = [];
+                    for (var i = 0; i < this.presentOverlays[0].length; i++) {
+                        var clone_shape = ShapesUtil.cloneShape(this.presentOverlays[0][i]);
+                        if (ShapesUtil.overlayItemIsShape(clone_shape)) {
+                            this.mapEditor.addShapeListeners(clone_shape, null);
+                        } else {
+                            this.mapEditor.addMarkerListeners(clone_shape, null);
+                        }
+                        overlays_copy[i] = clone_shape;
                     }
-                    overlays_copy[i] = clone_shape;
+                    this.prevOverlays.push(overlays_copy);
                 }
-                this.prevOverlays.push(overlays_copy);
-            }
-        }
-        this.presentOverlays = [];
-        this.presentOverlays.push(this.undoneOverlays[this.undoneOverlays.length - 1]);
-        this.undoneOverlays.pop();
+            }
+            this.presentOverlays = [];
+            this.presentOverlays.push(this.undoneOverlays[this.undoneOverlays.length - 1]);
+            this.undoneOverlays.pop();
+        }
     }
 }