Changeset 29225

Timestamp:

2014-08-21T13:20:09+12:00 (10 years ago)

Author:

kjdon

Message:

send the build request if we have changes that are not metadata changes

File:

• main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js (modified) (3 diffs)

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

@@ -306 +306 @@
         {
             var section = changedElem.parentDiv.parentItem;
-            saveTransaction('{"operation":"setText", "text":"' + changedElem.innerHTML.replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}');
+            saveTransaction('{"operation":"setText", "text":"' + changedElem.innerHTML.replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}'); //'
             addCollectionToBuild(section.collection);
         }
@@ -313 +313 @@
             var id = changedElem.getAttribute("id");
             var sectionID = id.substring(4);
-            saveTransaction('{"operation":"setText", "text":"' + changedElem.innerHTML.replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + gs.cgiParams.c + '", "oid":"' + sectionID + '"}');
+            saveTransaction('{"operation":"setText", "text":"' + changedElem.innerHTML.replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + gs.cgiParams.c + '", "oid":"' + sectionID + '"}'); //'
             addCollectionToBuild(gs.cgiParams.c);
         }
@@ -346 +346 @@
         }
     }
-    processChangesLoop(0);
+    if (metadataChanges.length>0) {
+      // this will process each change one by one, and then send the build request
+      processChangesLoop(0);
+    }
+    else if(_collectionsToBuild.length > 0) {
+      // if there are no metadata changes, but some other changes eg text have happened, then we need to send the build request.
+      sendBuildRequest();
+    }
+      
+    /* need to clear the changes from the page so that we don't process them again next time */
+    de.Changes.clear();
+    while (_deletedMetadata.length>0) {
+      _deletedMetadata.pop();
+    }
 
 }