Changeset 32471 for main/trunk/greenstone3

Timestamp:

2018-09-18T13:54:31+12:00 (6 years ago)

Author:

kjdon

Message:

moved some functions from documentedit_scripts to documentedit_scripts_util, as the util file was calling functions from main script. seemd the wrong way round and hard to find when you are debugging

Location:

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

Files:

• berrybasket/berrycheckout.js (modified) (1 diff)
• documentedit_scripts.js (modified) (1 diff)
• documentedit_scripts_util.js (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrycheckout.js

@@ -2 +2 @@
 var default_link_type = "document"; // "source" or "document"
 // use the appropriate one of these to override the default for particular collections.
-var source_link_collections = new Array(); // or add list of collections like ["pdfberry", "mgppdemo"];
+var source_link_collections = ["pdfberry"]; //new Array(); // or add list of collections like ["pdfberry", "mgppdemo"];
 var document_link_collections = new Array(); // or add list of collections as above.
 //these are the default metadata items used by  berry baskets.

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

@@ -328 +328 @@
 
 
-/************************************
-*    TEXT EDIT (CKEDITOR) SCRIPTS    *
-**************************************/
-
-//  not using this anymore as the instanceready never seems to get called 
-function addCKEEditableState(evt,stateArray) 
-{
-    // Event->Editor->CKE DOM Inline Element that editor was for->underlying jquery element 
-    element = evt.editor.element.$;
-    nodeText = element.innerHTML;
-         stateArray.push({
-             editableNode : element,
-             initHTML : nodeText
-         });
-}
-
-function addEditableState(editable,stateArray)
-{
-
-    if(editable.tagName == 'TEXTAREA')
-    {
-        nodeText = editable.value;
-    }
-    else 
-    {
-        nodeText = editable.innerHTML;
-    }
-
-        stateArray.push({
-                editableNode : editable,
-                initHTML : nodeText
-        });
-
-}
-
-function getLastEditableStates()
-{   
-    editableLastStates = [];
-        $(".sectionText").each(function(){addEditableState(this,editableLastStates);});
-        $(".metaTableCellArea").each(function(){addEditableState(this,editableLastStates);});
-
-}
-
-function changesToUpdate() 
-{
-    var resultArray = new Array();
-    getLastEditableStates();
-    for (var j in editableLastStates) 
-    {   
-        if (isNodeChanged(editableLastStates[j])) 
-        {
-            resultArray.push(editableLastStates[j].editableNode);
-        }
-    }
-    return resultArray;
-}
-
-
-function isNodeChanged(StateToCheck){
-    for (var i in editableInitStates) 
-    {
-        if ((StateToCheck.editableNode === editableInitStates[i].editableNode)) {
-        if ( StateToCheck.initHTML === editableInitStates[i].initHTML ) 
-        {
-            return false;
-        }
-        return true;
-        }
-    
-    }
-    // if get here, this must be a new node, as wasn't in init states
-    // make sure its not empty - we won't add empty nodes.
-    if (StateToCheck.initHTML == "") {
-    return false;
-    }
-
-    return true;
-    
-}
-
+

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

@@ -253 +253 @@
     _transactions = null;    
     location.reload(true); // force reload, not from cache, https://www.w3schools.com/jsref/met_loc_reload.asp 
+}
+
+/************************************
+*    TEXT EDIT (CKEDITOR) SCRIPTS    *
+**************************************/
+
+//  not using this anymore as the instanceready never seems to get called 
+function addCKEEditableState(evt,stateArray) 
+{
+    // Event->Editor->CKE DOM Inline Element that editor was for->underlying jquery element 
+    element = evt.editor.element.$;
+    nodeText = element.innerHTML;
+         stateArray.push({
+             editableNode : element,
+             initHTML : nodeText
+         });
+}
+
+function addEditableState(editable,stateArray)
+{
+
+    if(editable.tagName == 'TEXTAREA')
+    {
+        nodeText = editable.value;
+    }
+    else 
+    {
+        nodeText = editable.innerHTML;
+    }
+
+        stateArray.push({
+                editableNode : editable,
+                initHTML : nodeText
+        });
+
+}
+
+function getLastEditableStates()
+{   
+    editableLastStates = [];
+        $(".sectionText").each(function(){addEditableState(this,editableLastStates);});
+        $(".metaTableCellArea").each(function(){addEditableState(this,editableLastStates);});
+
+}
+
+function changesToUpdate() 
+{
+    var resultArray = new Array();
+    getLastEditableStates();
+    for (var j in editableLastStates) 
+    {   
+        if (isNodeChanged(editableLastStates[j])) 
+        {
+            resultArray.push(editableLastStates[j].editableNode);
+        }
+    }
+    return resultArray;
+}
+
+
+function isNodeChanged(StateToCheck){
+    for (var i in editableInitStates) 
+    {
+        if ((StateToCheck.editableNode === editableInitStates[i].editableNode)) {
+        if ( StateToCheck.initHTML === editableInitStates[i].initHTML ) 
+        {
+            return false;
+        }
+            //console.log("current="+StateToCheck.initHTML);
+            //console.log("init="+editableInitStates[i].initHTML);
+        return true;
+        }
+    
+    }
+    // if get here, this must be a new node, as wasn't in init states
+    // make sure its not empty - we won't add empty nodes.
+    if (StateToCheck.initHTML == "") {
+    return false;
+    }
+
+    return true;
+    
 }