Browse Source

Task #1991 - Adding a configuration option for the script jquery.frameready.js.

Ivan Tcholakov 14 years ago
parent
commit
bd8a3e1bfe

+ 7 - 2
main/document/showinframes.php

@@ -130,8 +130,13 @@ if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
                                 //   });';
 }
 
-$htmlHeadXtra[] = '<script language="javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js"></script>';
-$htmlHeadXtra[] = '<script language="javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript">
+<!--
+    var jQueryFrameReadyConfigPath = \''.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js\';
+-->
+</script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js"></script>';
 
 $htmlHeadXtra[] = '
 

+ 2 - 1
main/inc/lib/javascript/jquery.frameready.js

@@ -94,7 +94,8 @@ jQuery.frameReady = function(f,t,r,j) {
         You must specify the path to your jquery.js file below!
     *************************************************************/
 
-    var jQueryPath = "/main/inc/lib/javascript/jquery.js";
+    //var jQueryPath = "/main/inc/lib/javascript/jquery.js";
+    var jQueryPath = jQueryFrameReadyConfigPath; // Define this configuration parameter before loading this script.
 
     var u = "undefined";
     var $fr = $daemach["frameReady"];

+ 5 - 0
main/newscorm/lp_controller.php

@@ -35,6 +35,11 @@ require_once '../inc/global.inc.php';
 
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 if (api_get_setting('show_glossary_in_documents') == 'ismanual' || api_get_setting('show_glossary_in_documents') == 'isautomatic' ) {
+    $htmlHeadXtra[] = '<script type="text/javascript">
+<!--
+    var jQueryFrameReadyConfigPath = \''.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js\';
+-->
+</script>';
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js" type="text/javascript" language="javascript"></script>';
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
 }

+ 5 - 0
main/newscorm/lp_view.php

@@ -46,6 +46,11 @@ $my_style       = $platform_theme;
 $htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>';
 
 if (api_get_setting('show_glossary_in_documents') == 'ismanual' || api_get_setting('show_glossary_in_documents') == 'isautomatic' ) {
+    $htmlHeadXtra[] = '<script type="text/javascript">
+<!--
+    var jQueryFrameReadyConfigPath = \''.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js\';
+-->
+</script>';
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js" type="text/javascript" language="javascript"></script>';
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
 }