Changeset 30703 for main/trunk

Timestamp:

2016-08-15T11:24:20+12:00 (8 years ago)

Author:

kjdon

Message:

renamed isExpanded to isSectionExpanded, as when document editing is turned on, isExpanded from documentmaker_scripts_util is overriding this function and then the clicking on a thumbnail and having the right page open up doesn't work.

File:

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

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

@@ -272 +272 @@
         level = 0;
     }
-
     var parts = sectionID.split(".");
     if(level >= parts.length)
@@ -292 +291 @@
     }
     
-    if(!isExpanded(idToExpand))
+    if(!isSectionExpanded(idToExpand))
     {
         toggleSection(idToExpand, function(success)
@@ -319 +318 @@
         {
             var id = $(divs[i]).attr("id").replace(/^doc(.*)/, "$1");
-            if(isExpanded(id) != expand)
+            if(isSectionExpanded(id) != expand)
             {
                 //Don't collapse the top level
@@ -460 +459 @@
 }
 
-function isExpanded(sectionID)
+function isSectionExpanded(sectionID)
 {
     var docElem = gs.jqGet("doc" + sectionID);