L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-8992 Now only appearing once per page, and XHTML compliant. Also removed an ugly browser-sniffing css hack from the quicktime plugin, and applied the same browser detection as for the other plugins

Browse Source
This commit is contained in:
nicolasconnault
2007-11-05 14:10:38 +00:00
parent 50b474966c
commit 15fbde6aee
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/mediaplugin/filter.php
+5 -1
View File
@@ -20,6 +20,7 @@ require_once($CFG->libdir.'/filelib.php');
function mediaplugin_filter($courseid, $text) {
global $CFG;
static $eolas_fix_applied = false;
include 'defaultsettings.php';
@@ -86,7 +87,10 @@ function mediaplugin_filter($courseid, $text) {
$newtext = $text;
}
$newtext .= '<script defer="defer" src="' . $CFG->wwwroot . '/filter/mediaplugin/eolas_fix.js" type="text/javascript"></script>';
if (!$eolas_fix_applied) {
$newtext .= '<script defer="defer" src="' . $CFG->wwwroot . '/filter/mediaplugin/eolas_fix.js" type="text/javascript">// <![CDATA[ ]]></script>';
$eolas_fix_applied = true;
}
return $newtext;
}
mod/resource/type/file/resource.class.php
+6 -11
View File
@@ -535,15 +535,6 @@ function display() {
echo '</div>';
} else if ($resourcetype == "quicktime") {
echo '<style type="text/css">';
echo '/* class to hide nested objects in IE */';
echo '/* hides the second object from all versions of IE */';
echo '* html object.hiddenObjectForIE { display: none; }';
echo '/* display the second object only for IE5 Mac */';
echo '/* IE Mac \*//*/';
echo '* html object.hiddenObjectForIE { display: inline; }';
echo '/**/';
echo '</style>';
echo '<div class="resourcecontent resourceqt">';
echo '<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"';
@@ -554,13 +545,17 @@ function display() {
echo '<param name="controller" value="true" />';
echo '<param name="scale" value="aspect" />';
echo "<object class=\"hiddenObjectForIE\" type=\"video/quicktime\" data=\"$fullurl\">";
echo '<!--[if !IE]>-->';
echo "<object type=\"video/quicktime\" data=\"$fullurl\">";
echo '<param name="controller" value="true" />';
echo '<param name="autoplay" value="true" />';
echo '<param name="loop" value="true" />';
echo '<param name="scale" value="aspect" />';
echo '</object>';
echo '<!--<![endif]-->';
echo '<a href="' . $fullurl . '">' . $fullurl . '</a>';
echo '<!--[if !IE]>-->';
echo '</object>';
echo '<!--<![endif]-->';
echo '</object>';
echo '</div>';
} else if ($resourcetype == "flash") {