From: samhemelryk <samhemelryk>
Date: Thu, 17 Sep 2009 06:42:54 +0000 (+0000)
Subject: lib-cookies MDL-19737 Removed need to include cookies.js on every page
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ac310b3a7e5cb4e86007978038957a942b1246d1;p=moodle.git

lib-cookies MDL-19737 Removed need to include cookies.js on every page
Is only been used by SCORM and the chameleon theme so they include it locally when required
---

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index a3e9e09081..1efb7f6208 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -494,7 +494,6 @@ class moodle_core_renderer extends moodle_renderer_base {
         $this->page->requires->js('lib/javascript-mod.php')->in_head();
         $this->page->requires->js('lib/overlib/overlib.js')->in_head();
         $this->page->requires->js('lib/overlib/overlib_cssstyle.js')->in_head();
-        $this->page->requires->js('lib/cookies.js')->in_head();
         $this->page->requires->js_function_call('setTimeout', array('fix_column_widths()', 20));
 
         $focus = $this->page->focuscontrol;
diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php
index fd8e0f8f78..dd45646445 100644
--- a/mod/scorm/datamodels/aicclib.php
+++ b/mod/scorm/datamodels/aicclib.php
@@ -536,6 +536,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
         $result->toc .= $PAGE->requires->data_for_js('scormdata', array(
                 'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
                 'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')))->asap();
+        $result->toc .= $PAGE->requires->js('lib/cookies.js')->asap();
         $result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap();
     }
 
diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php
index c07b547d69..ae69e2a747 100644
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@ -320,6 +320,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
         $PAGE->requires->data_for_js('scormdata', array(
                 'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
                 'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')));
+        $PAGE->requires->js('lib/cookies.js');
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
 
diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php
index f1821a7fb9..33bee3bbc7 100644
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@ -211,6 +211,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
         $PAGE->requires->data_for_js('scormdata', array(
                 'plusicon' => $OUTPUT->mod_icon_url('pix/plus', 'scorm'),
                 'minusicon' => $OUTPUT->mod_icon_url('pix/minus', 'scorm')));
+        $PAGE->requires->js('lib/cookies.js');
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
 
diff --git a/mod/scorm/loaddatamodel.php b/mod/scorm/loaddatamodel.php
index 29b2e10226..e0548c546a 100644
--- a/mod/scorm/loaddatamodel.php
+++ b/mod/scorm/loaddatamodel.php
@@ -70,6 +70,7 @@
         print_error('cannotfindsco', 'scorm');
     }
     $scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR));   // Just to be safe
+    $PAGE->requires->js('lib/cookies.js')->asap();
     if (file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'.js.php')) {
         include_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'.js.php');
     } else {
diff --git a/theme/chameleon/header.html b/theme/chameleon/header.html
index 13e0716c9c..a299e5f424 100644
--- a/theme/chameleon/header.html
+++ b/theme/chameleon/header.html
@@ -7,7 +7,6 @@
     <link rel="shortcut icon" href="<?php echo $CFG->themewww .'/'. current_theme() ?>/favicon.ico" />
 
     <?php include('ui/chameleon.php'); ?>
-    <?php include("$CFG->javascript"); ?>
 </head>
 
 <body<?php
diff --git a/theme/chameleon/ui/chameleon.php b/theme/chameleon/ui/chameleon.php
index 9f113f77d5..1bb782ee87 100644
--- a/theme/chameleon/ui/chameleon.php
+++ b/theme/chameleon/ui/chameleon.php
@@ -19,6 +19,7 @@ if (!empty($THEME->chameleonenabled)) {
 
 <style type="text/css"> @import '<?php echo "$CFG->themewww/$chameleon_theme" ?>/ui/chameleon_ui.css'; </style>
 
+<script type="text/javascript" src="<?php echo "$CFG->wwwroot/lib/cookies.js" ?>"> </script>
 <script type="text/javascript" src="<?php echo "$CFG->themewww/$chameleon_theme/ui/css_query.js" ?>"> </script>
 <script type="text/javascript" src="<?php echo "$CFG->themewww/$chameleon_theme/ui/sarissa.js" ?>"> </script>
 <script type="text/javascript" src="<?php echo "$CFG->themewww/$chameleon_theme/ui/chameleon_js.php$chameleon_courseparam" ?>"> </script>