1. Moved jquery.autoHeight.js from "jscripts/infusion" to "jscripts/lib"

2. Added a new function ATutor.addJavascript() into ATutor.js. This function allows a JS script to include other JS scripts
3. Included jquery.autoHeight.js in ATutor_js.php instead of header templates
4. Removed inclusion of jquery.autoHeight.js from all header templates

diff --git a/docs/jscripts/ATutor.js b/docs/jscripts/ATutor.js
index 55a5c1d..3c119a9 100644 (file)
--- a/docs/jscripts/ATutor.js
+++ b/docs/jscripts/ATutor.js
@@ -496,4 +496,22 @@ ATutor.users.preferences = ATutor.users.preferences || {};
        });
     };
     
+    /*
+     * Allow adding javascript from javascript
+     * @param: jsname - the javascript to include. Make sure the path to the js file is correct
+     *         tagToAppendJS - Optional. The tag where you want the js file to be included. For example: head, body
+     * Refrence: http://javascript.about.com/library/bladdjs.htm
+     */
+    ATutor.addJavascript = function(jsname,tagToAppendJS) {
+       // set the default 
+       if (tagToAppendJS === undefined) {
+               tagToAppendJS = 'head';
+       }
+       var th = document.getElementsByTagName(tagToAppendJS)[0];
+       var s = document.createElement('script');
+       s.setAttribute('type','text/javascript');
+       s.setAttribute('src',jsname);
+       th.appendChild(s);
+    }
+
 })();

diff --git a/docs/jscripts/ATutor_js.php b/docs/jscripts/ATutor_js.php
index 7b4f64a..5affca5 100644 (file)
--- a/docs/jscripts/ATutor_js.php
+++ b/docs/jscripts/ATutor_js.php
@@ -60,4 +60,4 @@ ATutor.course = ATutor.course || {};
      });
 })();
 
-
+ATutor.addJavascript(ATutor.base_href+"jscripts/lib/jquery.autoHeight.js");
\ No newline at end of file

diff --git a/docs/jscripts/lib/jquery.autoHeight.js b/docs/jscripts/lib/jquery.autoHeight.js
new file mode 100644 (file)
index 0000000..01e0399
--- /dev/null
+++ b/docs/jscripts/lib/jquery.autoHeight.js
@@ -0,0 +1,34 @@
+function doIframe(){\r
+       o = document.getElementsByTagName('iframe');\r
+       for(i=0;i<o.length;i++){\r
+               if (/\bautoHeight\b/.test(o[i].className)){\r
+                       setHeight(o[i]);\r
+                       addEvent(o[i],'load', doIframe);\r
+               }\r
+       }\r
+}\r
+\r
+function setHeight(e){\r
+       if(e.contentDocument){\r
+               e.height = e.contentDocument.body.offsetHeight + 35;\r
+       } else {\r
+               e.height = e.contentWindow.document.body.scrollHeight;\r
+       }\r
+}\r
+\r
+function addEvent(obj, evType, fn){\r
+       if(obj.addEventListener)\r
+       {\r
+       obj.addEventListener(evType, fn,false);\r
+       return true;\r
+       } else if (obj.attachEvent){\r
+       var r = obj.attachEvent("on"+evType, fn);\r
+       return r;\r
+       } else {\r
+       return false;\r
+       }\r
+}\r
+\r
+if (document.getElementById && document.createTextNode){\r
+ addEvent(window,'load', doIframe);    \r
+}\r

diff --git a/docs/themes/blumin/include/header.tmpl.php b/docs/themes/blumin/include/header.tmpl.php
index c2d54fb..f309d8f 100644 (file)
--- a/docs/themes/blumin/include/header.tmpl.php
+++ b/docs/themes/blumin/include/header.tmpl.php
@@ -71,7 +71,6 @@ global $system_courses, $_custom_css, $_base_path;
        <?php endif; ?>
 
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
        <script language="javascript" type="text/javascript">
     //<!--
     jQuery.noConflict();

diff --git a/docs/themes/default/include/header.tmpl.php b/docs/themes/default/include/header.tmpl.php
index 11efcbc..afe14a4 100644 (file)
--- a/docs/themes/default/include/header.tmpl.php
+++ b/docs/themes/default/include/header.tmpl.php
@@ -75,13 +75,11 @@ global $system_courses, $_custom_css, $db;
        <link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
 <?php endif; ?>
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-    <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
        <script language="javascript" type="text/javascript">
        //<!--
        jQuery.noConflict();
        //-->
        </script>
-
     <script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
     <?php echo $this->custom_css; ?>
     <?php echo $this->rtl_css; ?>

diff --git a/docs/themes/default16/include/header.tmpl.php b/docs/themes/default16/include/header.tmpl.php
index b723ec3..fe0057d 100644 (file)
--- a/docs/themes/default16/include/header.tmpl.php
+++ b/docs/themes/default16/include/header.tmpl.php
@@ -72,7 +72,6 @@ global $system_courses, $_custom_css,$db;
        <link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
 <?php endif; ?>
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-    <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
        <script language="javascript" type="text/javascript">
        //<!--
        jQuery.noConflict();

diff --git a/docs/themes/default_classic/include/header.tmpl.php b/docs/themes/default_classic/include/header.tmpl.php
index c00cc18..0624d73 100644 (file)
--- a/docs/themes/default_classic/include/header.tmpl.php
+++ b/docs/themes/default_classic/include/header.tmpl.php
@@ -26,7 +26,6 @@ global $system_courses, $_custom_css, $_base_path;
        <link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
        <?php endif; ?>
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
     <script language="javascript" type="text/javascript">
     //<!--
     jQuery.noConflict();

diff --git a/docs/themes/fluid/include/header.tmpl.php b/docs/themes/fluid/include/header.tmpl.php
index ff30a6d..f59fc35 100644 (file)
--- a/docs/themes/fluid/include/header.tmpl.php
+++ b/docs/themes/fluid/include/header.tmpl.php
@@ -74,7 +74,6 @@ global $system_courses, $_custom_css, $db, $_base_path;
        <link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
        <?php endif; ?>
        <script type="text/javascript" src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
     <script language="javascript" type="text/javascript">
     //<!--
     jQuery.noConflict();

diff --git a/docs/themes/greenmin/include/header.tmpl.php b/docs/themes/greenmin/include/header.tmpl.php
index 50ce764..9c686fa 100644 (file)
--- a/docs/themes/greenmin/include/header.tmpl.php
+++ b/docs/themes/greenmin/include/header.tmpl.php
@@ -70,7 +70,6 @@ global $system_courses, $_custom_css, $_base_path;
        <link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
        <?php endif; ?>
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
     <script language="javascript" type="text/javascript">
     //<!--
     jQuery.noConflict();

diff --git a/docs/themes/idi/include/header.tmpl.php b/docs/themes/idi/include/header.tmpl.php
index ed24600..7b34168 100644 (file)
--- a/docs/themes/idi/include/header.tmpl.php
+++ b/docs/themes/idi/include/header.tmpl.php
@@ -71,7 +71,6 @@ global $system_courses, $_custom_css, $_base_path;
        <?php endif; ?>
 
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
        <script language="javascript" type="text/javascript">
     //<!--
     jQuery.noConflict();

diff --git a/docs/themes/mobile/include/header.tmpl.php b/docs/themes/mobile/include/header.tmpl.php
index 12edd50..fbbfa98 100644 (file)
--- a/docs/themes/mobile/include/header.tmpl.php
+++ b/docs/themes/mobile/include/header.tmpl.php
@@ -125,14 +125,12 @@ setTimeout(function() { window.scrollTo(0, 1) }, 100);
                
 
        <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
-       <script src="<?php echo $this->base_path; ?>jscripts/ATutorCourse.js" type="text/javascript"></script>   
        <script language="javascript" type="text/javascript">
        //<!--
        jQuery.noConflict();
        //-->
        </script>
+       <script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
 <?php if (($wurflObj->getDeviceCapability("mobile_browser")=="Safari")): ?>    
 
 <?php endif; ?>

diff --git a/docs/tools/prog.php b/docs/tools/prog.php
index 15e16f3..eea09d1 100644 (file)
--- a/docs/tools/prog.php
+++ b/docs/tools/prog.php
@@ -38,7 +38,6 @@ if ($_GET['tile']) {
     //-->
     </script>
     <script src="<?php echo $_base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
-    <script type="text/javascript" src="<?php echo $_base_path; ?>jscripts/ATutorCourse.js"></script>
     <link rel="stylesheet" href="<?php echo $_base_path; ?>themes/<?php echo $_SESSION['prefs']['PREF_THEME']; ?>/styles.css" type="text/css" />
     <style id="pref_style" type="text/css"></style> 
 </head>