- Timestamp:
- 2019-06-21T23:45:38+12:00 (5 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/classifier_scripts.js
r33168 r33187 155 155 } 156 156 updateOpenClassifiers(); 157 if(typeof mapEnabled !== 'undefined' && mapEnabled){157 if(typeof mapEnabled !== 'undefined'){ 158 158 getSubClassifier(sectionID); 159 159 } -
main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js
r33186 r33187 1 var mapEnabled = true; // variable to detect when map-scripts have been included into document_scripts.js and classifier_scripts.js 1 var mapEnabled = false; // variable to detect when map-scripts have been included into document_scripts.js and classifier_scripts.js 2 // Will be set to true iff we have gps map data that the map can display 2 3 3 4 //var newLat, newLng = 0; … … 33 34 if(jsonNodes && jsonNodes.length > 0) 34 35 { 36 mapEnabled = true; 35 37 for(var i = 0; i < jsonNodes.length; i++) 36 38 { … … 52 54 mapEnabled = false; 53 55 $("#map_canvas").css({display:"none"}); 54 return;56 //return; 55 57 } 56 58 } … … 115 117 function performSearchForMarkers() 116 118 { 119 if(typeof mapEnabled === 'undefined') return; 120 if(!mapEnabled){ return; } 121 117 122 //console.log("@@@ performSearchForMarkers()"); 118 123 … … 785 790 if(jsonNodes && jsonNodes.length > 0) 786 791 { 792 mapEnabled = true; 793 787 794 for(var i = 0; i < jsonNodes.length; i++) 788 795 { … … 797 804 } 798 805 799 $("#map_canvas").css({ "visibility": "visible", "height": ""});806 $("#map_canvas").css({display:"block"}); 800 807 } 801 808
Note:
See TracChangeset
for help on using the changeset viewer.