From 4d49202ffc13cb031fbfd231a8adc15685e6c6c8 Mon Sep 17 00:00:00 2001 From: samhemelryk Date: Wed, 8 Jul 2009 04:12:11 +0000 Subject: [PATCH] javascript-UFO MDL-19738 Stopped ufo.js being included in outputlib and included it in each place it was actually being used. 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 --- filter/mediaplugin/filter.php | 7 +++-- filter/mediaplugin/mediaplugin.js | 3 -- lib/javascript-static.js | 4 +++ lib/outputlib.php | 1 - mod/resource/type/file/file.js | 4 --- mod/resource/type/file/resource.class.php | 4 +-- webservice/amf/testclient/index.php | 34 +++++++++++++---------- 7 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 filter/mediaplugin/mediaplugin.js diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php index ce18d1c347..6aa5659bc8 100644 --- 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 index a5886a3654..0000000000 --- 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 2460edf6a7..6f7d951981 100644 --- 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 3a920ff1b1..3b356f9aad 100644 --- 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 44f40151f1..e0efccf168 100644 --- 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 fb65c261c0..0d52e2fd68 100644 --- 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 40835d2246..4ef8afd881 100644 --- a/webservice/amf/testclient/index.php +++ b/webservice/amf/testclient/index.php @@ -1,20 +1,24 @@ wwwroot/webservice/amf/testclient/moodleclient.swf"); -$serverurl = addslashes_js("$CFG->wwwroot/webservice/amf/server.php"); -echo ' -

You need to install Flash 9.0

- '; -echo << -// - -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 '
+

You need to install Flash 9.0

+
'; print_footer(); \ No newline at end of file -- 2.39.5