javascript-UFO MDL-19738 Stopped ufo.js being included in outputlib and included...

It will no only be loaded when it is being used. If something new comes along they will need to remember to require it.
At the same time cleaned up a few deprecated calls

diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index ce18d1c347906dcd4f5d5b034dd3b3a4319b4081..6aa5659bc8fcf6c72b60583d23170b239c035c94 100644 (file)
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -145,7 +145,8 @@ function mediaplugin_filter_mp3_callback($link) {
     $args['build'] = 40;
     $args['flashvars'] = $c;
     $args['quality'] = 'high';
-    $jsoutput = $PAGE->requires->js('filter/mediaplugin/mediaplugin.js')->asap();
+
+    $jsoutput = $PAGE->requires->js('lib/ufo.js')->asap();
     $jsoutput .= $PAGE->requires->data_for_js('FO', $args)->asap();
     $jsoutput .= $PAGE->requires->js_function_call('create_UFO_object', Array($id))->asap();
 
@@ -172,7 +173,7 @@ function mediaplugin_filter_swf_callback($link) {
     $args['build'] = 40;
     $args['allowscriptaccess'] = 'never';
     $args['quality'] = 'high';
-    $jsoutput = $PAGE->requires->js('filter/mediaplugin/mediaplugin.js')->asap();
+    $jsoutput = $PAGE->requires->js('lib/ufo.js')->asap();
     $jsoutput .= $PAGE->requires->data_for_js('FO', $args)->asap();
     $jsoutput .= $PAGE->requires->js_function_call('create_UFO_object', Array($id))->asap();
 
@@ -201,7 +202,7 @@ function mediaplugin_filter_flv_callback($link) {
     $args['allowscriptaccess'] = 'never';
     $args['quality'] = 'high';
     $args['allowfullscreen'] = 'true';
-    $jsoutput = $PAGE->requires->js('filter/mediaplugin/mediaplugin.js')->asap();
+    $jsoutput = $PAGE->requires->js('lib/ufo.js')->asap();
     $jsoutput .= $PAGE->requires->data_for_js('FO', $args)->asap();
     $jsoutput .= $PAGE->requires->js_function_call('create_UFO_object', Array($id))->asap();
 

diff --git a/filter/mediaplugin/mediaplugin.js b/filter/mediaplugin/mediaplugin.js
deleted file mode 100644 (file)
index a5886a3..0000000
--- a/filter/mediaplugin/mediaplugin.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function create_UFO_object(eid) {
-    UFO.create(FO, eid);
-}
\ No newline at end of file

diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index 2460edf6a75263b49c583fffdfc7a8f8575e6e54..6f7d95198153dfbe4145deaa9f0d647f1c11bdbe 100644 (file)
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -1069,3 +1069,7 @@ function cancel_scroll_to_end() {
         scrolltoendtimeout = null;
     }
 }
+
+function create_UFO_object(eid) {
+    UFO.create(FO, eid);
+}

diff --git a/lib/outputlib.php b/lib/outputlib.php
index 3a920ff1b1dc67fe2af5ed91bee1e98b61413306..3b356f9aad96d5f3b85b4c18e33fc29d59339e7f 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -1569,7 +1569,6 @@ class moodle_core_renderer extends moodle_renderer_base {
         $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('lib/ufo.js')->in_head();
         $this->page->requires->js_function_call('setTimeout', Array('fix_column_widths()', 20));
 
         $focus = $this->page->focuscontrol;

diff --git a/mod/resource/type/file/file.js b/mod/resource/type/file/file.js
index 44f40151f1f0ac70e8c9f0ce02a9d1bfbd21354b..e0efccf1683460381ce22ac6c9e9ee3044670e82 100644 (file)
--- a/mod/resource/type/file/file.js
+++ b/mod/resource/type/file/file.js
@@ -37,8 +37,4 @@ function resizeEmbeddedHtml(viewportheight) {
 function file_resource_init(viewportheight) {
     resizeEmbeddedHtml();
     YAHOO.widget.Overlay.windowResizeEvent.subscribe(resizeEmbeddedHtml);
-}
-
-function create_UFO_object(id) {
-    UFO.create(FO, id);
 }
\ No newline at end of file

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index fb65c261c0419eebc0335d9b81cd2efe77c37279..0d52e2fd6805fd6030a091c4c00e6f022630eff5 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -517,7 +517,7 @@ class resource_file extends resource_base {
                 $args['build'] = 40;
                 $args['flashvars'] = $c;
                 $args['quality'] = 'high';
-                echo $PAGE->requires->js('mod/resource/type/file/file.js')->asap();
+                echo $PAGE->requires->js('lib/ufo.js')->asap();
                 echo $PAGE->requires->data_for_js('FO', $args)->asap();
                 echo $PAGE->requires->js_function_call('create_UFO_object', Array($id))->asap();
 
@@ -553,7 +553,7 @@ class resource_file extends resource_base {
                 $args['allowscriptaccess'] = 'never';
                 $args['allowfullscreen'] = 'true';
                 $args['quality'] = 'high';
-                echo $PAGE->requires->js('mod/resource/type/file/file.js')->asap();
+                echo $PAGE->requires->js('lib/ufo.js')->asap();
                 echo $PAGE->requires->data_for_js('FO', $args)->asap();
                 echo $PAGE->requires->js_function_call('create_UFO_object', Array($id))->asap();
 

diff --git a/webservice/amf/testclient/index.php b/webservice/amf/testclient/index.php
index 40835d2246649e0e5eb6bcd3978dc90f6c326c2f..4ef8afd8816d6c7754eb21a970e859cda4cc8f86 100644 (file)
--- a/webservice/amf/testclient/index.php
+++ b/webservice/amf/testclient/index.php
@@ -1,20 +1,24 @@
 <?php
 require "../../../config.php";
-print_header_simple('Test Client', 'Test Client');
 
-$url = addslashes_js("$CFG->wwwroot/webservice/amf/testclient/moodleclient.swf");
-$serverurl = addslashes_js("$CFG->wwwroot/webservice/amf/server.php");
-echo '<span id="moodletestclient">
-      <p>You need to install Flash 9.0</p>
-    </span>';
 
-echo <<<EOF
-<script type="text/javascript">
-//<![CDATA[
-  var FO = { movie:"$url", width:"100%", height:"500", majorversion:"9", build:"0",
-    allowscriptaccess:"never", quality: "high", flashvars:"amfurl=$serverurl", setcontainercss:"true"};
-  UFO.create(FO, "moodletestclient");
-//]]>
-</script>
-EOF;
+$args['movie'] = $CFG->wwwroot.'/webservice/amf/testclient/moodleclient.swf';
+$args['width'] = '100%';
+$args['height'] = 500;
+$args['majorversion'] = 9;
+$args['build'] = 0;
+$args['allowscriptaccess'] = 'never';
+$args['quality'] = 'high';
+$args['flashvars'] = 'amfurl='.$CFG->wwwroot.'/webservice/amf/server.php';
+$args['setcontainercss'] = 'true';
+
+
+$PAGE->requires->js('lib/ufo.js')->in_head();
+$PAGE->requires->data_for_js('FO', $args);
+$PAGE->requires->js_function_call('create_UFO_object', Array('moodletestclient'));
+
+print_header_simple('Test Client', 'Test Client');
+echo '<div id="moodletestclient">
+      <p>You need to install Flash 9.0</p>
+    </div>';
 print_footer();
\ No newline at end of file