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

Timestamp:

2019-03-02T19:41:08+13:00 (5 years ago)

Author:

ak19

Message:

Save and rebuild works with map, but as with save shortcut key on map editor, the metamode ends up as accumulate still in doc.xml. Some other issues (not related to saveandrebuild) need fixing up like a popup about unsaved changes appearing even after save and rebuild has finished and possibly more things).

File:

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

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

@@ -111 +111 @@
         console.log(enableMessage);
         
-        
+        // Comment out following section in entirety -- from "e=e" to end of "if(e)" -- if
+        // you don't want to see the popup about changes that haven't been saved yet
         e = e || window.event;
         // For IE and Firefox
@@ -126 +127 @@
             }               
         }
+        
     }
 }
@@ -332 +334 @@
     //Keyboard shortcuts            
     var mapAndControls = document.getElementById("map-and-controls-" + this.id); 
-    console.log("@@@@ initMapEditor. mapAndControls: " + mapAndControls);
+    console.log("@@@@ initMapEditor. mapAndControls: ", mapAndControls);
     
     //Sets shift as unpressed
@@ -399 +401 @@
     var site_name = gs.xsltParams.site_name;
     var nodeID = this.id; // documentID, hopefully contains section ID too
-    var metaname = "GPS.mapOverlay";
-    
+    var metaname = gps_metadata_name;
+        
     // collection, site, documentID, metadataName, metadataPosition, responseFunction
     gs.functions.getArchivesMetadata(collection, site_name, nodeID, metaname, 0, function(responseText){
@@ -660 +662 @@
     console.log("Save pressed");
     
-    var json_overlays = ShapesUtil.overlayToJSON(this.overlays);
+    var json_overlays = JSON.stringify(ShapesUtil.overlayToJSON(this.overlays));    
+    that.savedOverlays = json_overlays; // save the old version to compare with future changes
     var collection = gs.cgiParams.c;
     var site_name = gs.xsltParams.site_name;
@@ -667 +670 @@
     
     // collection, site, documentID, metadataName, metadataPosition, metadataValue, prevMetadataValue, metamode, responseFunction   
-    gs.functions.setArchivesMetadata(collection, site_name, nodeID, metaname, 0, JSON.stringify(json_overlays), null, "override", function(){
+    gs.functions.setArchivesMetadata(collection, site_name, nodeID, metaname, 0, json_overlays, null, "override", function(){
             console.log("SAVED");
         }
     );
     
-    gs.functions.getArchivesMetadata(collection, site_name, nodeID, metaname, 0, function(responseText){
+    /*gs.functions.getArchivesMetadata(collection, site_name, nodeID, metaname, 0, function(responseText){
             var JSONString = responseText.getValue();
             that.savedOverlays = JSONString;
         }
-    );  
+    );*/
+    
     
 }