Skip to content
Snippets Groups Projects
Commit 950d1bce authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

DiscoJuice upgrade to JQuery 1.6 (from 1.4.3)

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2829 44740490-163a-0410-bde0-09ae8108e29a
parent d37ce3b9
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ class sspmod_discojuice_EmbedHelper { ...@@ -7,7 +7,7 @@ class sspmod_discojuice_EmbedHelper {
public static function head($includeJQuery = TRUE) { public static function head($includeJQuery = TRUE) {
$version = '0.1-2'; $version = '0.1-3';
$config = SimpleSAML_Configuration::getInstance(); $config = SimpleSAML_Configuration::getInstance();
$djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuiceembed.php'); $djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuiceembed.php');
...@@ -16,7 +16,7 @@ class sspmod_discojuice_EmbedHelper { ...@@ -16,7 +16,7 @@ class sspmod_discojuice_EmbedHelper {
if ($includeJQuery) { if ($includeJQuery) {
echo ' echo '
<!-- JQuery (Required for DiscoJuice) --> <!-- JQuery (Required for DiscoJuice) -->
<script type="text/javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-1.4.3.min.js') . '"></script> <script type="text/javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-1.6.min.js') . '"></script>
<script type="text/javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-ui-1.8.5.custom.min.js') . '"></script> <script type="text/javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-ui-1.8.5.custom.min.js') . '"></script>
<link rel="stylesheet" type="text/css" href="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/css/custom/jquery-ui-1.8.5.custom.css') . '" /> <link rel="stylesheet" type="text/css" href="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/css/custom/jquery-ui-1.8.5.custom.css') . '" />
......
<?php <?php
$version = '0.1-2'; $version = '0.1-3';
header('P3P:CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"'); header('P3P:CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"');
...@@ -21,7 +21,7 @@ echo '<link rel="shortcut icon" href="' . SimpleSAML_Module::getModuleURL('disco ...@@ -21,7 +21,7 @@ echo '<link rel="shortcut icon" href="' . SimpleSAML_Module::getModuleURL('disco
echo '<!-- JQuery -->'; echo '<!-- JQuery -->';
echo '<script type="text/javascript" language="javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-1.4.3.min.js') . '"></script> echo '<script type="text/javascript" language="javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-1.6.min.js') . '"></script>
<script type="text/javascript" language="javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-ui-1.8.5.custom.min.js') . '"></script> <script type="text/javascript" language="javascript" src="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/jquery-ui-1.8.5.custom.min.js') . '"></script>
<link rel="stylesheet" type="text/css" href="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/css/custom/jquery-ui-1.8.5.custom.css') . '" /> <link rel="stylesheet" type="text/css" href="' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/css/custom/jquery-ui-1.8.5.custom.css') . '" />
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment