Changeset 30736

Timestamp:

2016-08-22T20:48:17+12:00 (8 years ago)

Author:

ak19

Message:

Several bugfixes noticed in the Images-GPS tutorial collection: 1. Dr Bainbridge fixed the huge location URL string by having it passed by POST instead of GET. 2. Dr Bainbridge corrected a check for the existence of an object returned with jQuery. Also applied the same correction in another location where this test is used. This helped withb expanding and collapsing book shelves using the plus icon. 3. The bookshelf nodes would expand upwards instead of downwards. Corrected this too. 4. The Scroll Through Places checkbox was not functioning, as it would keep scrolling even when unchecked. Now fixed.

File:

• main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js (modified) (7 diffs)

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

@@ -35 +35 @@
         else
         {
-            $("#map_canvas").css({visibility:"hidden", height:"0px"});
+            //$("#map_canvas").css({visibility:"hidden", height:"0px"});
+            $("#map_canvas").css({visibility:"hidden"});
         }
     }
@@ -46 +47 @@
         startStopCheckbox.click(function()
         {
-            if(startStopCheckbox.attr("checked"))
-            {
+            // http://stackoverflow.com/questions/901712/how-to-check-if-a-checkbox-is-checked-in-jquery
+            // http://stackoverflow.com/questions/5270689/attrchecked-checked-does-not-work
+        
+            if($('#scrollCheckbox').is(':checked')) // OR: if(document.getElementById('scrollCheckbox').checked)
+            {           
                 if(_intervalHandle == null)
                 {
@@ -171 +175 @@
     }
     
-    var url = gs.xsltParams.library_name + "?a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=jsonNodes";
-    
-    $.ajax(url)
+    //var url = gs.xsltParams.library_name + "?a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=jsonNodes";
+    var url = gs.xsltParams.library_name;
+    var data = "a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=jsonNodes";
+    
+    $.ajax({type:"POST", url:url, data:data})
     .success(function(responseText)
     {
+        //console.log("*** responseText (first 250) = " + responseText.substring(0,256));
+        
         if(responseText.search("id=\"jsonNodes") != -1)
         {
@@ -207 +215 @@
         
         _searchRunning = false;
+    }).fail(function(responseText, textStatus, errorThrown) // fail() has replaced error(), http://api.jquery.com/jquery.ajax/
+        {
+            console.log("In map-scripts.performSearchForMarkers(): Got an error in ajax call");
+            _searchRunning = false;
     });
 }
@@ -631 +643 @@
         }
         
-        if(section)
-        {
+        // 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))
             {
@@ -638 +653 @@
                 sectionToggle.attr("src", gs.imageURLs.expand);
                 
-                if(openClassifiers[sectionID] != undefined)
+                if(openClassifiers[sectionID].length !== 0) //if(openClassifiers[sectionID] != undefined)
                 {
                     delete openClassifiers[sectionID];
@@ -684 +699 @@
                 var newDiv = $("<div>");                                        
                 var sibling = gs.jqGet("title" + sectionID);
-                sibling.before(newDiv);
+                sibling.after(newDiv);
                 
                 newDiv.html(responseText);