Changeset 32871 for main/trunk/greenstone3
- Timestamp:
- 2019-03-07T19:20:59+13:00 (5 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts.js
r32854 r32871 154 154 // But for now, we're doing this here *because* this is the procedure with regular metadata (works out changes, 155 155 // then saves those changes as initStates BEFORE saveAndRebuild is called) 156 map_editor.savedOverlays = newMapData;156 //map_editor.savedOverlays = newMapData; // happens after all setArchivesMeta calls have succeeded, just at the start of sendBuildRequest() in documentedit_scripts_util.js::saveAndRebuild() 157 157 } 158 158 -
main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts_util.js
r32857 r32871 345 345 var sendBuildRequest = function() 346 346 { 347 console.log("Replacing init states with current states"); 348 // Clean changes. We're here because setting meta for all meta changes was successful, so 349 // - update doc's metadata initial states to current: 350 editableInitStates = editableLastStates; 351 // - update doc's map editors' initial states to current: 352 var map_editors_array = Object.values(gsmap_store); 353 for(var i = 0; i < map_editors_array.length; i++) { 354 var map_editor = map_editors_array[i]; 355 map_editor.savedOverlays = JSON.stringify(ShapesUtil.overlayToJSON(map_editor.overlays)); 356 } 357 358 347 359 var request = "["; 348 360 for(var i = 0; i < _transactions.length; i++) … … 442 454 443 455 //Clean changes 444 editableInitStates = editableLastStates; 456 ////editableInitStates = editableLastStates; // moved into processChangesLoop(): when all changes have successfully been processed. 457 // Alternative is to set initState per metadata in changes array: after each setArchiveMetadata call for each individual meta change. 458 // But since our setMeta calls are always synchronous, happening in sequence, if one setArchivesMeta() call fails 459 // we'll not attempt subsequent ones or coll building at the end. 445 460 446 461 for(var i = 0; i < changes.length; i++)
Note:
See TracChangeset
for help on using the changeset viewer.