Skip to content

Commit 99d7ef5

Browse files
committed
Remove jQuery 1.8 dependencies
1 parent dea7916 commit 99d7ef5

16 files changed

Lines changed: 32 additions & 4 deletions

templates/disco.tpl.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

33
$this->data['header'] = $this->t('selectidp');
4-
$this->data['jquery'] = ['core' => true, 'ui' => true, 'css' => true];
4+
$this->data['jquery'] = ['core' => true, 'ui' => false, 'css' => false];
55

6+
$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="'.
7+
SimpleSAML\Module::getModuleURL('discopower/assets/css/uitheme1.12.1/jquery-ui.min.css').'" />';
68
$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="'.
79
SimpleSAML\Module::getModuleURL('discopower/assets/css/disco.css').'" />';
810

@@ -12,6 +14,8 @@
1214
SimpleSAML\Module::getModuleURL('discopower/assets/js/'.$this->data['score'].'.js').'"></script>'."\n";
1315
$this->data['head'] .= '<script type="text/javascript" src="'.
1416
SimpleSAML\Module::getModuleURL('discopower/assets/js/tablist.js').'"></script>'."\n";
17+
$this->data['head'] .= '<script type="text/javascript" src="'.
18+
SimpleSAML\Module::getModuleURL('discopower/assets/js/jquery-ui-1.12.1.min.js').'"></script>'."\n";
1519

1620
if (!empty($this->data['faventry'])) {
1721
$this->data['autofocus'] = 'favouritesubmit';

templates/disco.twig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
{% extends "base.twig" %}
33

44
{% block preload %}
5-
<link rel="stylesheet" media="screen" href="/{{ baseurlpath }}resources/uitheme1.8/jquery-ui.css">
5+
<link rel="stylesheet" media="screen" href="/{{ baseurlpath }}module.php/discopower/assets/css/uitheme1.12.1/jquery-ui.min.css">
66
<link rel="stylesheet" media="screen" href="/{{ baseurlpath }}module.php/discopower/assets/css/disco.css">
77
{% endblock %}
88
{% block postload %}
9-
<script src="/{{ baseurlpath }}resources/jquery-1.8.js"></script>
10-
<script src="/{{ baseurlpath }}resources/jquery-ui-1.8.js"></script>
9+
<script src="/{{ baseurlpath }}module.php/discopower/assets/js/jquery-ui-1.12.1.min.js"></script>
1110
<script src="/{{ baseurlpath }}module.php/discopower/assets/js/jquery.livesearch.js"></script>
1211
<script src="/{{ baseurlpath }}module.php/discopower/assets/js/{{ score }}.js"></script>
1312
<script src="/{{ baseurlpath }}module.php/discopower/assets/js/tablist.js"></script>
335 Bytes
Loading
207 Bytes
Loading
262 Bytes
Loading
262 Bytes
Loading
332 Bytes
Loading
280 Bytes
Loading
6.76 KB
Loading
4.44 KB
Loading

0 commit comments

Comments
 (0)