Changeset 33128 for main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

Timestamp:

2019-06-06T20:53:13+12:00 (5 years ago)

Author:

wy59

Message:

Improvements to Coordinate support AND bugfixes. BUT not all the fixes may be ideal, many marked with TODO. 1. Now we support an Array of coordinates. At present these are only displayed as Markers, but in future shapes should appear as shapes. 2. Bugfixes include: (a) expanding sections wasn't working when we had hierarchical docs with Coordinate data, because map-scripts 'overrode' the toggleSection function but no longer did any of the doc expanding behaviour that document_scripts.js used to do. This was not a problem with the ImagesGPS collection, simply because that did not have hierarchical/sectionalised documents. (b) Perl: A previous commit output duplicate Coordinates into the index. Now this doesn't happen. Fix works but may not be ideal. 3. Perl: (a) Reserved index names CD, CS for Coordinate and CoordShort. Note however that LAT and LNG were never added to reserve list for index names. (b) Now doc.pm::processCoord() takes a section parameter and works out the section-ptr from that.

File:

• main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js (modified) (12 diffs)

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

@@ -1 +1 @@
 /** Javascript file for viewing documents */
+
+//-------TODO--------//
+// map-scripts.js needs these, but non-map viewing does not. Yet if we add these to map_scripts,
+// then in classifier mode, map_scripts will use classifier_scripts.js which already has these
+// So for now, we add them into this file for when map_scripts is in doc view mode and includes document_scripts.js.
+// It seems suboptimal, as these variables and function will be wasted when in regular non-map mode.
+// But unable to think of any other solution at present.
+var inProgress = new Array();
+var openClassifiers = new Array();
+var busy = false;
+
+
+
+function updateOpenClassifiers()
+{
+    var oc = "";
+    var first = true;
+    for(var key in openClassifiers)
+    {
+        if(first)
+        {
+            first = false;
+        }
+        else
+        {
+            oc += ",";
+        }
+        
+        oc += key;
+    }
+    
+    if(oc != undefined)
+    {
+        window.location.hash = oc;
+    }
+}
+
+//---------------//
 
 /** NOTE, this file uses inline templates which look for httpPath, assocfilepath, Source, Thumb, Title metadata. These need to be added into any xsl file that uses this javascript (using <gsf:metadata name="xx" hidden="true"/> if they are not already being collected. */
@@ -66 +104 @@
     url += "&ck=" + gs.cgiParams.ck;
     }
-     
-    
+    
+    
     
     $.ajax(url)
@@ -82 +120 @@
             }
             
-            var text = response.substring(textStart, textEnd);
+            var text = response.substring(textStart, textEnd);          
             callback(text);
         }
@@ -133 +171 @@
                 return;
             }
-            
-            var sections = response.substring(sectionsStart, sectionsEnd);
-            callback(sections);
+            else {
+                var sections = response.substring(sectionsStart, sectionsEnd);
+                callback(sections);
+            }
         }
         else
@@ -145 +184 @@
     {
         callback(null);
-    });
-}
-
+    });             
+}
+
+// TODO:
+// DO NOT "MERGE" _basicToggleSection into toggleSection!
+// map_scripts.js calls _basicToggleSection as it redefines toggleSection() to do (more) stuff.
 function toggleSection(sectionID, callback, tocDisabled)
+{
+    _basicToggleSection(sectionID, callback, tocDisabled);  
+}
+function _basicToggleSection(sectionID, callback, tocDisabled)
 {
     var docElem = gs.jqGet("doc" + sectionID);
@@ -173 +219 @@
             {
                 if(text)
-                {   
+                {                   
                     var nodeID = sectionID.replace(/\./g, "_");
                     if(text.search("wrap" + nodeID) != -1)
@@ -193 +239 @@
                             if(callback)
                             {
-                                callback(true);
+                                callback(true);                             
                             }
                             
@@ -219 +265 @@
                     }
                 }
-            });
-        
-            docToggleElem.attr("src", gs.imageURLs.loading);
+            });     
+            
+            docToggleElem.attr("src", gs.imageURLs.loading);            
         }
         else
@@ -310 +356 @@
 {
     expandAndExecute(sectionID, level, tocDisabled, function()
-            {
+            {               
                 var topVal = $(document.getElementById("doc" + sectionID)).offset().top - 50;
                 $('html, body').stop().animate({scrollTop: topVal}, 1000);
@@ -332 +378 @@
     if(!level)
     {
-        level = 0;
+        level = 0;      
     }
     var parts = sectionID.split(".");
@@ -360 +406 @@
         toggleSection(idToExpand, function(success)
         {
-            if(success)
-            {
-                expandAndExecute(sectionID, level + 1, tocDisabled, executeAfter);
-            }
-        }, tocDisabled);
+                if(success)
+                {
+                    expandAndExecute(sectionID, level + 1, tocDisabled, executeAfter);
+                }           
+            }, tocDisabled);        
     }
     else
@@ -534 +580 @@
 {
     var docElem = gs.jqGet("doc" + sectionID);
-    if(docElem.css("display") == "block")
+    
+    if(docElem.css("display") === "block")
     {
         return true;