revert a3a9e37 to have no javascript error on detailed page

swissbib · Jun 26, 2019 · a280553 · a280553
1 parent 1cb763a
commit a280553
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/themes/sbvfrd/templates/layout/layout.phtml b/themes/sbvfrd/templates/layout/layout.phtml
@@ -108,6 +108,19 @@ JS;
   // Append TypeScript generated output
   $this->headScript()->appendFile("swissbib/swissbib.ts.js");
 
+  // Extend swissbib global object by autocomplete configuration
+  $autoSuggestConfig = json_encode($this->autoSuggestConfig()->toArray());
+  $swissbibObjectExtension = <<<JS
+(function(s) {
+  var autoSuggestConfiguration = {$autoSuggestConfig};
+  s.autoSuggestConfiguration = function () {
+    return autoSuggestConfiguration;
+  };
+})(window.swissbib = window.swissbib || {});
+JS;
+
+  $this->headScript()->appendScript($swissbibObjectExtension);
+
   ?>  <?=$this->headScript()?>
 </head>
 <body>
@@ -158,6 +171,7 @@ if (!isset($this->layout()->searchbox)) {
     </div>
   </div>
 </div>
+</body>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -171,6 +185,4 @@ $(document).ready(function()
 });
 </script>
 
-</body>
-
 </html>
diff --git a/themes/sbvfrd/templates/search/searchbox.phtml b/themes/sbvfrd/templates/search/searchbox.phtml
@@ -18,18 +18,6 @@
     $lastLimit = $this->searchMemory()->getLastLimit($this->searchClassId);
     $searchtabs = $this->searchtabs($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType);
 
-// Extend swissbib global object by autocomplete configuration
-$autoSuggestConfig = json_encode($this->autoSuggestConfig($this->searchClassId)->toArray());
-$swissbibObjectExtension = <<<JS
-(function(s) {
-  var autoSuggestConfiguration = {$autoSuggestConfig};
-  s.autoSuggestConfiguration = function () {
-    return autoSuggestConfiguration;
-  };
-})(window.swissbib = window.swissbib || {});
-JS;
-
-$this->headScript()->appendScript($swissbibObjectExtension);
 ?>
 
 <?php if ($this->searchType == 'advanced'): ?>