Changeset 31429 for main/trunk/greenstone3/web/interfaces/default/js

Timestamp:

2017-02-17T21:57:33+13:00 (7 years ago)

Author:

Georgiy Litvinov

Message:

Added base function expandAndExecute for focusSection and focusAnchor

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 @@
 function focusSection(sectionID, level, tocDisabled)
 {
+    expandAndExecute(sectionID, level, tocDisabled, function()
+            {
+                var topVal = $(document.getElementById("doc" + sectionID)).offset().top - 50;
+                $('html, body').stop().animate({scrollTop: topVal}, 1000);
+            });
+}
+function focusAnchor(sectionID, level, tocDisabled, anchor)
+{
+    expandAndExecute(sectionID, level, tocDisabled, function()
+        {
+            var target = document.getElementById(anchor);
+            if (!target){
+                target = document.getElementsByName(anchor)[0];
+            }
+            var topVal = $(target).offset().top - 50;
+            $('html, body').stop().animate({scrollTop: topVal}, 1000);
+            window.location.hash = anchor;
+        });
+}
+function expandAndExecute(sectionID, level, tocDisabled, executeAfter)
+{
     if(!level)
     {
@@ -279 +300 @@
     if(level >= parts.length)
     {
-        var topVal = $(document.getElementById("doc" + sectionID)).offset().top - 50;
-        $('html, body').stop().animate({scrollTop: topVal}, 1000);
+        executeAfter();
         return;
     }
@@ -301 +321 @@
             if(success)
             {
-                focusSection(sectionID, level + 1, tocDisabled);
+                expandAndExecute(sectionID, level + 1, tocDisabled, executeAfter);
             }
         }, tocDisabled);
@@ -307 +327 @@
     else
     {
-        focusSection(sectionID, level + 1, tocDisabled);
-    }
-}
-function focusAnchor(sectionID, level, tocDisabled, anchor)
-{
-    if(!level)
-    {
-        level = 0;
-    }
-    var parts = sectionID.split(".");
-    if(level >= parts.length)
-    {
-        var target = document.getElementById(anchor);
-        if (!target){
-            target = document.getElementsByName(anchor)[0];
-        }
-        var topVal = $(target).offset().top - 50;
-        $('html, body').stop().animate({scrollTop: topVal}, 1000);
-        window.location.hash = anchor;
-        return;
-    }
-    
-    var idToExpand = "";
-    for(var i = 0; i < level + 1; i++)
-    {
-        if(i > 0)
-        {
-            idToExpand += ".";
-        }
-    
-        idToExpand += parts[i];
-    }
-    
-    if(!isSectionExpanded(idToExpand))
-    {
-        toggleSection(idToExpand, function(success)
-        {
-            if(success)
-            {
-                focusAnchor(sectionID, level + 1, tocDisabled, anchor);
-            }
-        }, tocDisabled);
-    }
-    else
-    {
-        focusAnchor(sectionID, level + 1, tocDisabled, anchor);
+        expandAndExecute(sectionID, level + 1, tocDisabled, executeAfter);
     }
 }