Changeset 28168 for main/trunk/greenstone3/web/interfaces/default/js

Timestamp:

2013-08-27T15:24:42+12:00 (11 years ago)

Author:

sjm84

Message:

Some fixes as well as some improvements

File:

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

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

@@ -235 +235 @@
             value = escape(value);
 
+            changedElem.originalValue = changedElem.innerHTML;
+            
             metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:changedElem.originalValue});
-
-            changedElem.originalValue = changedElem.innerHTML;
             addCollectionToBuild(collection);
         }
@@ -285 +285 @@
                     alert(gs.text.dse.error_saving);
                 
-                    var saveButton = document.getElementById("saveButton");
-                    saveButton.innerHTML = gs.text.dse.save_changes;
-                    saveButton.disabled = false;
+                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
                     
-                    _statusBar.removeStatus(statusID);
+                    if(_statusBar)
+                    {
+                        _statusBar.removeStatus(statusID);
+                    }
                     return;
                 }
 
-                _statusBar.removeStatus(statusID);
+                if(_statusBar)
+                {
+                    _statusBar.removeStatus(statusID);
+                }
                 buildCollections(_collectionsToBuild);
             }
@@ -300 +305 @@
         if(_collectionsToBuild.length > 0)
         {
-            var saveButton = document.getElementById("saveButton");
-            saveButton.innerHTML = gs.text.dse.saving + "...";
-            saveButton.disabled = true;
-
-            statusID = _statusBar.addStatus(gs.text.dse.modifying_archives + "...");
+            $("#saveButton, #quickSaveButton").html(gs.text.dse.saving + "...");
+            $("#saveButton, #quickSaveButton").attr("disabled", "disabled");
+
+            if(_statusBar)
+            {
+                statusID = _statusBar.addStatus(gs.text.dse.modifying_archives + "...");
+            }
             ajax.send("a=g&rt=r&s=DocumentExecuteTransaction&s1.transactions=" + request);
         }
@@ -337 +344 @@
 function buildCollections(collections, documents, callback)
 {
-    var saveButton = document.getElementById("saveButton");
     if(!collections || collections.length == 0)
     {
         console.log(gs.text.dse.empty_collection_list);
-        saveButton.innerHTML = gs.text.save_changes;
-        saveButton.disabled = false;
+        $("#saveButton, #quickSaveButton").html(gs.text.save_changes);
+        $("#saveButton, #quickSaveButton").removeAttr("disabled");
         return;
     }
@@ -371 +377 @@
     {
         var ajax = new gs.functions.ajaxRequest();
-        ajax.open("GET", _baseURL + "?a=g&rt=r&ro=1&s=" + buildOperation + "&s1.collection=" + collections[counter] + docs);
+        ajax.open("GET", gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=" + buildOperation + "&s1.collection=" + collections[counter] + docs);
         ajax.onreadystatechange = function()
         {
@@ -383 +389 @@
                     alert(gs.text.dse.could_not_build_p1 + " " + collections[counter] + gs.text.dse.could_not_build_p2);
                     
-                    _statusBar.removeStatus(statusID);
-                    saveButton.innerHTML = gs.text.dse.save_changes;
-                    saveButton.disabled = false;
+                    if(_statusBar)
+                    {
+                        _statusBar.removeStatus(statusID);
+                    }
+                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
                     
                     return;
@@ -397 +406 @@
                     /*
                     var localAjax = new gs.functions.ajaxRequest();
-                    localAjax.open("GET", _baseURL + "?a=g&rt=r&ro=1&s=ActivateCollection&s1.collection=" + collections[counter], true);
+                    localAjax.open("GET", gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=ActivateCollection&s1.collection=" + collections[counter], true);
                     localAjax.onreadystatechange = function()
                     {
@@ -409 +418 @@
                                 alert(gs.text.dse.could_not_activate_p1 + " " + collections[counter] + gs.text.dse.could_not_activate_p2);
                                 
-                                _statusBar.removeStatus(statusID);
-                                saveButton.innerHTML = gs.text.dse.save_changes;
-                                saveButton.disabled = false;
+                                if(_statusBar)
+                                {
+                                    _statusBar.removeStatus(statusID);
+                                }
+                                $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+                                $("#saveButton, #quickSaveButton").removeAttr("disabled");
                                 
                                 return;
@@ -439 +451 @@
                                     _transactions = new Array();
 
-                                    _statusBar.removeStatus(statusID);
-                                    saveButton.innerHTML = gs.text.dse.save_changes;
-                                    saveButton.disabled = false;
+                                    if(_statusBar)
+                                    {
+                                        _statusBar.removeStatus(statusID);
+                                    }
+                                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+                                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
                                 /*
                                 });
@@ -447 +462 @@
                         }
                     }
-                    _statusBar.changeStatus(statusID, gs.text.dse.activating + " " + collections[counter] + "...");
+                    if(_statusBar)
+                    {
+                        _statusBar.changeStatus(statusID, gs.text.dse.activating + " " + collections[counter] + "...");
+                    }
                     localAjax.send();
                     */
@@ -453 +471 @@
             }
         }
-        statusID = _statusBar.addStatus(gs.text.dse.building + " " + collections[counter] + "...");
+        if(_statusBar)
+        {
+            statusID = _statusBar.addStatus(gs.text.dse.building + " " + collections[counter] + "...");
+        }
         ajax.send();
     }
@@ -463 +484 @@
     var ajaxFunction = function()
     {
-        var saveButton = document.getElementById("saveButton");
-        
         var ajax = new gs.functions.ajaxRequest();
-        ajax.open("GET", _baseURL + "?a=g&rt=s&ro=1&s=" + serverFunction + "&s1.pid=" + pid, true);
+        ajax.open("GET", gs.xsltParams.library_name + "?a=g&rt=s&ro=1&s=" + serverFunction + "&s1.pid=" + pid, true);
         ajax.onreadystatechange = function()
         {
@@ -478 +497 @@
                     alert(gs.text.dse.could_not_check_status_p1 + " " + serverFunction + gs.text.dse.could_not_check_status_p2a);
                     
-                    _statusBar.removeStatus(statusID);
-                    saveButton.innerHTML = gs.text.dse.save_changes;
-                    saveButton.disabled = false;
+                    if(_statusBar)
+                    {
+                        _statusBar.removeStatus(statusID);
+                    }
+                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
                     
                     return;
@@ -496 +518 @@
                     alert(gs.text.dse.could_not_check_status_p1 + " " + serverFunction + gs.text.dse.could_not_check_status_p2b);
                     
-                    _statusBar.removeStatus(statusID);
-                    saveButton.innerHTML = gs.text.dse.save_changes;
-                    saveButton.disabled = false;
+                    if(_statusBar)
+                    {
+                        _statusBar.removeStatus(statusID);
+                    }
+                    $("#saveButton, #quickSaveButton").html(gs.text.dse.save_changes);
+                    $("#saveButton, #quickSaveButton").removeAttr("disabled");
                 }
                 else