From 5b95b4bb2d1a12eb1985af75369a9826ed13db4c Mon Sep 17 00:00:00 2001
From: Olimpia Magliulo <olimpiam@intern-ikts-MacBook-Air.local>
Date: Thu, 9 Nov 2017 11:43:32 +0100
Subject: [PATCH] Change call to selectize
add document.ready function to script.js where all the calls to selectize are made.
update base.twig. Now script.js is the last script in the list.
---
templates/base.twig | 2 +-
www/assets/js/src/language.js | 3 ---
www/assets/js/src/script.js | 5 +++++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/templates/base.twig b/templates/base.twig
index 6415fda2a..ccbba8599 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -45,7 +45,6 @@
<!-- postload javascript -->
- <script type="text/javascript" src="/{{ baseurlpath }}assets/js/src/script.js"></script>
{% if jquery %}
{% set version = '1.8' %}
{% if jquery.version %}
@@ -66,5 +65,6 @@
<script type="text/javascript" src="/{{ baseurlpath }}assets/js/lib/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="/{{ baseurlpath }}assets/js/lib/selectize.min.js"></script>
<script type="text/javascript" src="/{{ baseurlpath }}assets/js/src/language.js"></script>
+ <script type="text/javascript" src="/{{ baseurlpath }}assets/js/src/script.js"></script>
{% block postload %}{% endblock %}
</body></html>
diff --git a/www/assets/js/src/language.js b/www/assets/js/src/language.js
index 2b04d6c47..9150e4354 100644
--- a/www/assets/js/src/language.js
+++ b/www/assets/js/src/language.js
@@ -15,7 +15,4 @@ $(document).ready(function() {
}
});
- $('.language-menu').selectize();
- $('.language-menu-small').selectize();
-
});
diff --git a/www/assets/js/src/script.js b/www/assets/js/src/script.js
index 3adf1b1f8..7364bdaa3 100644
--- a/www/assets/js/src/script.js
+++ b/www/assets/js/src/script.js
@@ -39,3 +39,8 @@ function SimpleSAML_hide(id) {
element.style.display = 'none';
}
+
+$(document).ready(function() {
+ $('.language-menu').selectize();
+ $('#organization').selectize();
+});
\ No newline at end of file
--
GitLab