From 7549a37a9c2f9164f20cd76de845cd94f8df6126 Mon Sep 17 00:00:00 2001
From: Guy Halse <ghalse@users.noreply.github.com>
Date: Tue, 19 Mar 2019 23:46:10 +0200
Subject: [PATCH] discopower module tabs don't work (#1078)
* Fix discopower tabs
* Remove duplication of search prototype
---
modules/discopower/templates/disco.tpl.php | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/modules/discopower/templates/disco.tpl.php b/modules/discopower/templates/disco.tpl.php
index 1d3ec8979..3472a6e30 100644
--- a/modules/discopower/templates/disco.tpl.php
+++ b/modules/discopower/templates/disco.tpl.php
@@ -7,9 +7,10 @@ $this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" hre
SimpleSAML\Module::getModuleURL('discopower/assets/css/disco.css').'" />';
$this->data['head'] .= '<script type="text/javascript" src="'.
- SimpleSAML\Module::getModuleURL('discopower/assets/js/jquery.livesearch.js').'"></script>';
+ SimpleSAML\Module::getModuleURL('discopower/assets/js/jquery.livesearch.js').'"></script>'."\n";
$this->data['head'] .= '<script type="text/javascript" src="'.
- SimpleSAML\Module::getModuleURL('discopower/assets/js/quicksilver.js').'"></script>';
+ SimpleSAML\Module::getModuleURL('discopower/assets/js/'.$this->data['score'].'.js').'"></script>'."\n";
+$this->data['head'] .= $this->data['search'];
if (!empty($this->data['faventry'])) {
$this->data['autofocus'] = 'favouritesubmit';
@@ -129,20 +130,5 @@ foreach ($this->data['idplist'] as $tab => $slist) {
</div>
-<script type="text/javascript">
-$(document).ready(function () {
<?php
-$i = 0;
-foreach ($this->data['idplist'] as $tab => $slist) {
- echo "\n".'$("#query_'.$tab.'").liveUpdate("#list_'.$tab.'")'.
- (($i++ == 0) && (empty($this->data['faventry'])) ? '.focus()' : '').';';
-}
-?>
-});
-
-</script>
-
-<?php
-$this->data['head'] .= '<script type="text/javascript" src="'.
- SimpleSAML\Module::getModuleURL('discopower/assets/js/suggest.js').'"></script>';
$this->includeAtTemplateBase('includes/footer.php');
--
GitLab