Changeset 33145 for main/trunk/greenstone3/web/interfaces/default/js/classifier_scripts.js

Timestamp:

2019-06-11T19:11:35+12:00 (5 years ago)

Author:

wy59

Message:

1. Merging improvements of map-scripts::toggleSection() into classifier_scripts::toggleSection(), as the code was intended originally to be mostly duplicated. But improvements had been made to map-scripts::toggleSection independently, so bringing those across. 2. Likewise, map-scripts::httpRequest() originally largely duplicated classifier_scripts::httpRequest(), but documentbasket related conditional branch may have been added at a later point and had not been ported across into the map-scripts version. With Dr Bainbridge's permission, we've now done that. 3. Rest is cleanup

File:

• main/trunk/greenstone3/web/interfaces/default/js/classifier_scripts.js (modified) (2 diffs)

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

@@ -37 +37 @@
     
     //If the div exists
-    if(section.length)
+    // Test if 'section' exists.  
+    // ==> Because we're using jQuery to do this we need to test the length of the object returned
+    // http://stackoverflow.com/questions/920236/how-can-i-detect-if-a-selector-returns-null
+    if(section.length !== 0)
     {
         if(isExpanded(sectionID))
@@ -44 +47 @@
             sectionToggle.attr("src", gs.imageURLs.expand);
 
-            if(openClassifiers[sectionID] != undefined)
+            if(openClassifiers[sectionID].length !== 0) //if(openClassifiers[sectionID] != undefined)
             {
                 delete openClassifiers[sectionID];