Changeset 33155

Timestamp:

2019-06-15T15:28:01+12:00 (5 years ago)

Author:

davidb

Message:

Moved two functions from document script to utility script so they are available to other pages as well (e.g. berrybasket tearaway on search and browse pages)

Location:

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

Files:

• document_scripts.js (modified) (1 diff)
• utility_scripts.js (modified) (1 diff)

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

@@ -1232 +1232 @@
 
 
-/***************
-* MENU SCRIPTS *
-***************/
-function moveScroller() {
-  var move = function() {
-    var editbar = $("#editBar");
-    var st = $(window).scrollTop();
-    var fa = $("#float-anchor").offset().top;
-    if(st > fa) {
-      
-      editbar.css({
-      position: "fixed",
-        top: "0px",
-        width: editbar.data("width"),
-        //width: "30%"
-            });
-    } else {
-      editbar.data("width", editbar.css("width"));
-      editbar.css({
-      position: "relative",
-        top: "",
-        width: ""
-        });
-    }
-  };
-  $(window).scroll(move);
-  move();
-}
-
-
-function floatMenu(enabled)
-{
-    var menu = $(".tableOfContentsContainer");
-    if(enabled)
-    {
-        menu.data("position", menu.css("position"));
-        menu.data("width", menu.css("width"));
-        menu.data("right", menu.css("right"));
-        menu.data("top", menu.css("top"));
-        menu.data("max-height", menu.css("max-height"));
-        menu.data("overflow", menu.css("overflow"));
-        menu.data("z-index", menu.css("z-index"));
-        
-        menu.css("position", "fixed");
-        menu.css("width", "300px");
-        menu.css("right", "0px");
-        menu.css("top", "100px");
-        menu.css("max-height", "600px");
-        menu.css("overflow", "auto");
-        menu.css("z-index", "200");
-        
-        $("#unfloatTOCButton").show();
-    }
-    else
-    {
-        menu.css("position", menu.data("position"));
-        menu.css("width", menu.data("width"));
-        menu.css("right", menu.data("right"));
-        menu.css("top", menu.data("top"));
-        menu.css("max-height", menu.data("max-height"));
-        menu.css("overflow", menu.data("overflow"));
-        menu.css("z-index", menu.data("z-index"));
-        
-        $("#unfloatTOCButton").hide();
-        $("#floatTOCToggle").prop("checked", false);
-    }
-    
-    var url = gs.xsltParams.library_name + "?a=d&ftoc=" + (enabled ? "1" : "0") + "&c=" + gs.cgiParams.c;
-    
-    $.ajax(url);
-}
 
 /********************

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

@@ -87 +87 @@
     return url_encoded;
 }
+
+/***************
+* MENU SCRIPTS *
+***************/
+function moveScroller() {
+  var move = function() {
+    var editbar = $("#editBar");
+    var st = $(window).scrollTop();
+    var fa = $("#float-anchor").offset().top;
+    if(st > fa) {
+      
+      editbar.css({
+      position: "fixed",
+        top: "0px",
+        width: editbar.data("width"),
+        //width: "30%"
+            });
+    } else {
+      editbar.data("width", editbar.css("width"));
+      editbar.css({
+      position: "relative",
+        top: "",
+        width: ""
+        });
+    }
+  };
+  $(window).scroll(move);
+  move();
+}
+
+
+function floatMenu(enabled)
+{
+    var menu = $(".tableOfContentsContainer");
+    if(enabled)
+    {
+        menu.data("position", menu.css("position"));
+        menu.data("width", menu.css("width"));
+        menu.data("right", menu.css("right"));
+        menu.data("top", menu.css("top"));
+        menu.data("max-height", menu.css("max-height"));
+        menu.data("overflow", menu.css("overflow"));
+        menu.data("z-index", menu.css("z-index"));
+        
+        menu.css("position", "fixed");
+        menu.css("width", "300px");
+        menu.css("right", "0px");
+        menu.css("top", "100px");
+        menu.css("max-height", "600px");
+        menu.css("overflow", "auto");
+        menu.css("z-index", "200");
+        
+        $("#unfloatTOCButton").show();
+    }
+    else
+    {
+        menu.css("position", menu.data("position"));
+        menu.css("width", menu.data("width"));
+        menu.css("right", menu.data("right"));
+        menu.css("top", menu.data("top"));
+        menu.css("max-height", menu.data("max-height"));
+        menu.css("overflow", menu.data("overflow"));
+        menu.css("z-index", menu.data("z-index"));
+        
+        $("#unfloatTOCButton").hide();
+        $("#floatTOCToggle").prop("checked", false);
+    }
+    
+    var url = gs.xsltParams.library_name + "?a=d&ftoc=" + (enabled ? "1" : "0") + "&c=" + gs.cgiParams.c;
+    
+    $.ajax(url);
+}