Changeset 29085 for main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js

Timestamp:

2014-05-29T14:30:09+12:00 (10 years ago)

Author:

kjdon

Message:

several changes. need to encodeURI the orig value too, before passing to metadataChanges. Have moved sendBuildRequest definition up so I can call it separately, not as the callback funciton in setMetadataLoop - if we have deleted some elements, but not made any other changes, then this wasn't being called, and the deletions weren't making their way into the index. Use row.hide to disappear the row when click remove. row.css didn't seem to work. need to set changedElem.original value after getting out the previous original.

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

@@ -211 +211 @@
     }
 
-    var changes = de.Changes.getChangedEditableSections();
-    var metadataChanges = new Array();
-    
-    for(var i = 0; i < changes.length; i++)
-    {
-        var changedElem = changes[i];
-        
-        //Save metadata 
-        if(gs.functions.hasClass(changedElem, "metaTableCell")) 
-        {
-            //Get document ID
-            var currentElem = changedElem;
-            while((currentElem = currentElem.parentNode).tagName != "TABLE");
-            var docID = currentElem.getAttribute("id").substring(4);
-
-            //Get metadata name
-            var row = changedElem.parentNode;
-            var cells = row.getElementsByTagName("TD");
-            var nameCell = cells[0];
-            var name = nameCell.innerHTML;
-            var value = changedElem.innerHTML;
-            value = value.replace(/&nbsp;/g, " ");
-            value = encodeURI(value);
-
-            changedElem.originalValue = changedElem.innerHTML;
-            metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:changedElem.originalValue});
-            addCollectionToBuild(collection);
-        }
-        //Save content
-        else if(gs.functions.hasClass(changedElem, "renderedText"))
-        {
-            var section = changedElem.parentDiv.parentItem;
-            saveTransaction('{"operation":"setText", "text":"' + changedElem.innerHTML.replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}');
-            addCollectionToBuild(section.collection);
-        }
-        else if(gs.functions.hasClass(changedElem, "sectionText"))
-        {
-            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 + '"}');
-            addCollectionToBuild(gs.cgiParams.c);
-        }
-    }
-    
     var sendBuildRequest = function()
     {
@@ -314 +270 @@
         }
     }
+
+    var changes = de.Changes.getChangedEditableSections();
+    var metadataChanges = new Array();
+    if (changes.length == 0) {
+      sendBuildRequest();
+      return;
+    }
+    
+    for(var i = 0; i < changes.length; i++)
+    {
+        var changedElem = changes[i];
+        
+        //Save metadata     
+        if(gs.functions.hasClass(changedElem, "metaTableCell")) 
+        {
+            //Get document ID
+            var currentElem = changedElem;
+            while((currentElem = currentElem.parentNode).tagName != "TABLE");
+            var docID = currentElem.getAttribute("id").substring(4);
+
+            //Get metadata name
+            var row = changedElem.parentNode;
+            var cells = row.getElementsByTagName("TD");
+            var nameCell = cells[0];
+            var name = nameCell.innerHTML;
+            var value = changedElem.innerHTML;
+            value = value.replace(/&nbsp;/g, " ");
+            value = encodeURI(value);
+
+            var orig = changedElem.originalValue;
+            if (orig) {
+              orig = orig.replace(/&nbsp;/g, " ");
+              orig = encodeURI(orig);
+            }
+            //changedElem.originalValue = changedElem.innerHTML;
+            //metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:changedElem.originalValue});
+            metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:orig});
+            changedElem.originalValue = changedElem.innerHTML;
+            //changedElem.originalValue = value;
+            addCollectionToBuild(collection);
+        }
+        //Save content
+        else if(gs.functions.hasClass(changedElem, "renderedText"))
+        {
+            var section = changedElem.parentDiv.parentItem;
+            saveTransaction('{"operation":"setText", "text":"' + changedElem.innerHTML.replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}');
+            addCollectionToBuild(section.collection);
+        }
+        else if(gs.functions.hasClass(changedElem, "sectionText"))
+        {
+            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 + '"}');
+            addCollectionToBuild(gs.cgiParams.c);
+        }
+    }
+    
+    
     
     var setMetadataLoop = function(index)
     {
+      
         var change = metadataChanges[index];
         
@@ -764 +779 @@
         _undoOperations.push(undo);
         _deletedMetadata.push(row);
-        row.css("display", "none");
+        //row.css("display", "none");
+        $(row).hide();
     });
     newCell.append(removeLink);