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

Timestamp:

2016-04-20T22:56:11+12:00 (8 years ago)

Author:

davidb

Message:

Changes in the XSL and JS code to support the new approach taken to client-side XSLT (using Saxon-CE JS library in the browser). Also the reintroduction of the DirectEdit (Seaweed) template. Not on by default but a simple matter to call the re-instated template for projects that would like to make use of it, such as the digital music stand DL collection. Some white-space changes also occured. This was not deliberate, but would have been quite fiddly to tease out from other changes in the file, so consequently left in.

File:

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

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

@@ -408 +408 @@
 }
 
+function retrieveFullTableOfContentsSuccess(newTOCElem)
+{
+    var tocStart = newTOCElem.indexOf(">") + 1;
+    var tocEnd = newTOCElem.lastIndexOf("<");
+    
+    var newTOC = newTOCElem.substring(tocStart, tocEnd);
+    
+    //Add the "Expand document"/"Collapse document" links
+    newTOC = "<table style=\"width:100%; text-align:center;\"><tr><td><a href=\"javascript:expandOrCollapseAll(true);\">Expand document</a></td><td><a href=\"javascript:expandOrCollapseAll(false);\">Collapse document</a></td></tr></table>" + newTOC;
+    
+    //Collapse the TOC
+    newTOC = newTOC.replace(/display:block/g, "display:none");
+    newTOC = newTOC.replace(/display:none/, "display:block");
+    newTOC = newTOC.replace(/images\/collapse/g, "images/expand");
+    
+    var tocElem = $("#tableOfContents");
+    tocElem.html(newTOC);
+    
+    gs.variables.tocLoaded = true;
+}
+
+function retrieveFullTableOfContentsSuccessClientSideXSLT(newTOCElem)
+{
+    $('#client-side-xslt-ajax').remove();
+    retrieveFullTableOfContentsSuccess(newTOCElem)
+}
+
 function retrieveFullTableOfContents()
 {
@@ -419 +446 @@
         url += "&a=d&d=&alb=1&rl=1&href=" + gs.cgiParams.href;
     }
-
+    
+    if (gs.xsltParams.use_client_side_xslt == "true") { // note xsltParams are of type string, so test needs to be in quotes
+    url += "&callback=retrieveFullTableOfContentsSuccessClientSideXSLT"; // used in client-side-xslt.js, in combination with 'excerptid'
+        $('<iframe src="'+url+'" id="client-side-xslt-ajax" tabindex="-1" style="position: absolute; width: 0px; height: 0px; border: none;"></iframe>').appendTo('body');
+    }
+    else {  
     $.ajax(url)
-    .success(function(newTOCElem)
-    {
-        var tocStart = newTOCElem.indexOf(">") + 1;
-        var tocEnd = newTOCElem.lastIndexOf("<");
-        
-        var newTOC = newTOCElem.substring(tocStart, tocEnd);
-        
-        //Add the "Expand document"/"Collapse document" links
-        newTOC = "<table style=\"width:100%; text-align:center;\"><tr><td><a href=\"javascript:expandOrCollapseAll(true);\">Expand document</a></td><td><a href=\"javascript:expandOrCollapseAll(false);\">Collapse document</a></td></tr></table>" + newTOC;
-        
-        //Collapse the TOC
-        newTOC = newTOC.replace(/display:block/g, "display:none");
-        newTOC = newTOC.replace(/display:none/, "display:block");
-        newTOC = newTOC.replace(/images\/collapse/g, "images/expand");
-        
-        var tocElem = $("#tableOfContents");
-        tocElem.html(newTOC);
-        
-        gs.variables.tocLoaded = true;
-    })
-    .error(function()
-    {
+        .success(retrieveFullTableOfContentsSuccess)
+        .error(function() {
         setTimeout(retrieveFullTableOfContents, 1000);
-    });
+        });
+    }
 }