Permalink
Browse files

Update to v0.5 / ME.js 2.6.5

  • Loading branch information...
1 parent 7496837 commit 01aad47db9d21fc599166fa92864b1b3919bc32d @emirpprime committed Mar 1, 2012
@@ -2,7 +2,7 @@
# License GNU/GPL http://www.gnu.org/copyleft/gpl.html
# pb_mediael.xml
-PLUGIN DESC=<h1>pb:MediaEl 0.4 [Plugin]</h1><strong>Based on Media Element.JS 2.2.5 (<a href="_QQ_"http://mediaelementjs.com"_QQ_" title="Homepage of Media Element.JS"_QQ_" target="_QQ_"_blank"_QQ_">http://mediaelementjs.com</a>)</strong><p><strong>Description:</strong><br />Content Plugin which provides a HTML5 Video Player for Joomla! 1.6.</p><p><strong>Syntax:</strong><br />Place the following code in an article: <pre wrap="_QQ_"wrap"_QQ_">{pb_mediael media=[video] width=[640] height=[480] autoplay=[true] preload=[true] loop=[true] video_mp4=[http://myvideo.mp4] video_m4v=[http://myvideo.m4v] video_mov=[http://myvideo.mov] video_webm=[http://myvideo.webm] video_ogg=[http://myvideo.ogg] flash=[http://myvideo.mp4] image=[http://myvideo.png] image_visibility=[true]}<br/>or<br/>{pb_mediael media=[audio] width=[250] height=[25] autoplay=[true] preload=[true] loop=[true] audio_m4a=[http://myaudio.m4a] audio_mp3=[http://myaudio.mp3] audio_mpeg=[http://myaudio.mpeg] flash=[http://myaudio.mp4] image=[http://myvideo.png] image_visibility=[true]}</pre></p><p>These are all parameters. Minimum required is media, width, height and a source file.</p><p>For video: MP4, M4V and MOV should be encoded as H264 - these can also be specified as the Flash fallback file. Silverlight will automatically use the same files.</p><p>For audio: any of the listed formats can be used for the Flash file.</p>
+PLUGIN DESC=<h1>pb:MediaEl 0.5 [Plugin]</h1><strong>Based on Media Element.JS 2.6.5 (<a href="_QQ_"http://mediaelementjs.com"_QQ_" title="Homepage of Media Element.JS"_QQ_" target="_QQ_"_blank"_QQ_">http://mediaelementjs.com</a>)</strong><p><strong>Description:</strong><br />Content Plugin which provides a HTML5 Video Player for Joomla! 1.6.</p><p><strong>Syntax:</strong><br />Place the following code in an article: <pre wrap="_QQ_"wrap"_QQ_">{pb_mediael media=[video] width=[640] height=[480] autoplay=[true] preload=[true] loop=[true] video_mp4=[http://myvideo.mp4] video_m4v=[http://myvideo.m4v] video_mov=[http://myvideo.mov] video_webm=[http://myvideo.webm] video_ogg=[http://myvideo.ogg] flash=[http://myvideo.mp4] image=[http://myvideo.png] image_visibility=[true]}<br/>or<br/>{pb_mediael media=[audio] width=[250] height=[25] autoplay=[true] preload=[true] loop=[true] audio_m4a=[http://myaudio.m4a] audio_mp3=[http://myaudio.mp3] audio_mpeg=[http://myaudio.mpeg] flash=[http://myaudio.mp4] image=[http://myvideo.png] image_visibility=[true]}</pre></p><p>These are all parameters. Minimum required is media, width, height and a source file.</p><p>For video: MP4, M4V and MOV should be encoded as H264 - these can also be specified as the Flash fallback file. Silverlight will automatically use the same files.</p><p>For audio: any of the listed formats can be used for the Flash file.</p>
# Video
DEFAULT AUDIO PARAMETER=<strong>Audio Parameter</strong>
@@ -45,7 +45,7 @@ function pluginPbMediaEl(&$row, &$params) {
}
}
if (!$foundJqueryScripts) {
- $document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js');
+ $document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js');
}
$foundMediaelScripts = false;
for ($i = 0; $i<count($scripts); $i++) {
@@ -63,13 +63,14 @@ function pluginPbMediaEl(&$row, &$params) {
}
}
- $document->addScriptDeclaration(' var $j = jQuery.noConflict();
+ $document->addScriptDeclaration('
+ var $j = jQuery.noConflict();
$j(document).ready(function() {
$j("video,audio").mediaelementplayer({
startVolume: '.$pluginParams->get('defaultVolume', '0.85').',
enableAutosize: true,
});
- });');
+ });');
// Parse shortcodes in content
for ($i=$GLOBALS['plg_pb_mediael']; $i<$GLOBALS['plg_pb_mediael']+$hits; $i++) {
@@ -240,7 +241,7 @@ function contentPbMediaEl_createHTML($id, &$pluginParams, &$videoParamsList) {
$html .= '</object>';
}
- $html .='<p class="PbMediaEl"><strong>If you cannot see the media above - download here: </strong>';
+ $html .='<span class="PbMediaEl"><strong>If you cannot see the media above - download here: </strong>';
if ($audio_m4a != "") {
$html .= '<a href="'.$audio_m4a.'">M4A</a> ';
@@ -268,7 +269,7 @@ function contentPbMediaEl_createHTML($id, &$pluginParams, &$videoParamsList) {
$html .= '<a href="'.$video_ogg.'">Ogg</a><br>';
}
- $html .= '</p>';
+ $html .= '</span>';
$html .= '</'.$media.'>';
@@ -7,7 +7,7 @@
<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
<authorEmail>pb@mrc-lmb.cam.ac.uk</authorEmail>
<authorUrl>www2.mrc-lmb.cam.ac.uk</authorUrl>
- <version>0.4</version>
+ <version>0.5</version>
<description>PLUGIN DESC</description>
<files>
<filename plugin="pb_mediael">pb_mediael.php</filename>
Binary file not shown.
Oops, something went wrong.

0 comments on commit 01aad47

Please sign in to comment.