Changeset 33187

Timestamp:

2019-06-21T23:45:38+12:00 (5 years ago)

Author:

wy59

Message:

Bugfix to recently introduced bug: when there are bookshelves, suddenly the 33168 revision commit didn't display the map any more. This broke it for ImagesGPS' classifier display but also for our sectioned collection's classifier display. We still have issues with our classifier not showing all the correct maps and their bounds, but at least, the map shows again when a bookshelf has been opened.

Location:

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

Files:

• classifier_scripts.js (modified) (1 diff)
• map-scripts.js (modified) (6 diffs)

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

@@ -155 +155 @@
             }
             updateOpenClassifiers();            
-            if(typeof mapEnabled !== 'undefined' && mapEnabled){
+            if(typeof mapEnabled !== 'undefined'){
                 getSubClassifier(sectionID);
             }

main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js

@@ -1 @@
-var mapEnabled = true; // variable to detect when map-scripts have been included into document_scripts.js and classifier_scripts.js
+var mapEnabled = false; // variable to detect when map-scripts have been included into document_scripts.js and classifier_scripts.js
+                        // Will be set to true iff we have gps map data that the map can display
 
 //var newLat, newLng = 0;
@@ -33 +34 @@
         if(jsonNodes && jsonNodes.length > 0)
         {
+            mapEnabled = true;
             for(var i = 0; i < jsonNodes.length; i++)
             {
@@ -52 +54 @@
             mapEnabled = false;
             $("#map_canvas").css({display:"none"});
-            return;
+            //return;
         }   
     }   
@@ -115 +117 @@
 function performSearchForMarkers()
 {
+    if(typeof mapEnabled === 'undefined') return;
+    if(!mapEnabled){ return; }
+    
     //console.log("@@@ performSearchForMarkers()");
     
@@ -785 +790 @@
         if(jsonNodes && jsonNodes.length > 0)
         {
+            mapEnabled = true;
+            
             for(var i = 0; i < jsonNodes.length; i++)
             {
@@ -797 +804 @@
             }
             
-            $("#map_canvas").css({"visibility": "visible", "height": ""});
+            $("#map_canvas").css({display:"block"});
         }