Changeset 32850 for main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts.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/documentedit_scripts.js (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts.js

@@ -81 +81 @@
         });
     newLink.click(function () {
-        console.log(metaTable.metaNameField);
         if (metaTable.css("display") == "none") {
             linkLabel.html(gs.text.de.hide_metadata);
@@ -137 +136 @@
         if(!oldMapData && newMapData !== "[]" || oldMapData && oldMapData !== newMapData) {
             var nodeID = map_editors_array[i].id;
-            console.log("old vs new mapdata for nodeID " + nodeID);
-            console.log(oldMapData);
-            console.log(newMapData);
+            //console.log("old vs new mapdata for nodeID " + nodeID);
+            //console.log("OLD: " + oldMapData);
+            //console.log("NEW: " + newMapData);
             
             modifiedMaps.push({
@@ -149 +148 @@
             });
             
+            // Save the new overlay values as the old ones for the state after saving and rebuilding is done.
+            // Ideally this should be do after saveAndRebuild has completed successfully, since if saveAndRebuild goes wrong
+            // we'd not have saved newMapData AND because savedOverlays will contain the newMapData, we won't detect these unsaved
+            // values in future attempts to save.
+            // But for now, we're doing this here *because* this is the procedure with regular metadata (works out changes,
+            // then saves those changes as initStates BEFORE saveAndRebuild is called)          
             map_editor.savedOverlays = newMapData;
         }