r41170 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r41169‎ | r41170 | r41171 >
Date:22:43, 22 September 2008
Author:dale
Status:old
Tags:
Comment:
improved mv_embed skin support
Modified paths:
  • /trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_nativeEmbed.js (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.css (deleted) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/mv_playlist.js (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skin (deleted) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/ie_styles.css (deleted) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/images (deleted) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/ie_styles.css (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/ie_styles.css (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css (added) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/skins/styles.css (deleted) (history)

Diff [purge]

Index: trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php
@@ -24,7 +24,7 @@
2525 php ogg_thumb_insert.php stream_name filename interval duration
2626
2727 EXAMPLE
28 - ogg_thumb_insert.php stream_name /var/www/localhost/htdocs/media/stream.ogg 20
 28+ ogg_thumb_insert.php stream_name stream.ogg 20
2929
3030 Notes:
3131 if possible you want to use the source footage rather than the ogg to generate the thumbnails (ie the mpeg2 or dv)
@@ -42,7 +42,7 @@
4343
4444 $filedir='../stream_images/'.substr($stream_id, -1).'/'.$stream_id;
4545 $dbw =$dbr = wfGetDB(DB_MASTER);
46 -for($i=0;$i<$duration;$i+=$interval){
 46+for($i=0;$i<$duration;$i+=$interval){
 47+ shell_exec("ffmpeg -ss $i -i {$filename} -vcodec mjpeg -vframes 1 -an -f rawvideo -y {$filedir}/{$i}.jpg");
4748 $dbw->query("INSERT INTO `mv_stream_images` (`stream_id`, `time`) VALUES ($stream_id, $i)");
48 - shell_exec("ffmpeg -ss $i -i {$filename} -vcodec mjpeg -vframes 1 -an -f rawvideo -y {$filedir}/{$i}.jpg");
4949 }
Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.css
@@ -1,53 +0,0 @@
2 -.mv_track {
3 - margin-bottom:20px;
4 - position:relative;
5 -}
6 -.player_select_list {
7 - color:white;
8 - font-size:10pt;
9 -/* display:none;*/
10 -}
11 -
12 -.player_select_list a:visited {
13 - color:white;
14 -}
15 -.displayHTML a:visited {
16 - color:white;
17 -}
18 -.mv_playhead {
19 - position:absolute;
20 - top:0;
21 - left:0;
22 - width:17px;
23 - height:21px;
24 - /*http://art.gnome.org/themes/gtk2*/
25 -}
26 -.mv_status {
27 - font-family:"Times New Roman", Times, serif;
28 - font-size:14px;
29 - float:left;
30 -}
31 -.set_ogg_player_pref{
32 - text-align:left;
33 -}
34 -
35 -.inputTrackerInput {
36 - height:20;
37 - width:30;
38 - font-family : Arial, Helvetica, sans-serif;
39 - font-size : 12px;
40 -}
41 -.mv_loading_icon {
42 - position:absolute;
43 - top:0px;
44 - right:0px;
45 - width:16px;
46 - height:16px;
47 -}
48 -div.floatleft, table.floatleft {
49 - border:0pt none;
50 - clear:left;
51 - float:left;
52 - margin:0pt 0.5em 0.5em 0pt;
53 - position:relative;
54 -}
Index: trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_nativeEmbed.js
@@ -50,6 +50,11 @@
5151 monitor : function(){
5252 //js_log('native:monitor');
5353 this.getVID(); //make shure we have .vid obj
 54+ if(!this.vid){
 55+ js_log('could not find video embed: '+this.id + ' stop monitor');
 56+ this.stopMonitor();
 57+ return false;
 58+ }
5459 //js_log('time loaded: ' + this.vid.TimeRanges );
5560 //js_log('current time: '+ this.vid.currentTime + ' dur: ' + this.duration);
5661
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_cc.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_cc.png
___________________________________________________________________
Added: svn:mime-type
5762 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_to_clipboard.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_to_clipboard.png
___________________________________________________________________
Added: svn:mime-type
5863 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_big_play_button.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_big_play_button.png
___________________________________________________________________
Added: svn:mime-type
5964 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_grey_right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_grey_right.png
___________________________________________________________________
Added: svn:mime-type
6065 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/logo.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/logo.png
___________________________________________________________________
Added: svn:mime-type
6166 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/ico_rss.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/ico_rss.png
___________________________________________________________________
Added: svn:mime-type
6267 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/flash_player.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/flash_player.jpg
___________________________________________________________________
Added: svn:mime-type
6368 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/other_results_top2.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/other_results_top2.png
___________________________________________________________________
Added: svn:mime-type
6469 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_fullscreen.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_fullscreen.png
___________________________________________________________________
Added: svn:mime-type
6570 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/transparent_bg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/transparent_bg.png
___________________________________________________________________
Added: svn:mime-type
6671 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/other_results_bg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/other_results_bg.png
___________________________________________________________________
Added: svn:mime-type
6772 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_grey_left.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_grey_left.png
___________________________________________________________________
Added: svn:mime-type
6873 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_video.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_video.jpg
___________________________________________________________________
Added: svn:mime-type
6974 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_volume_tag.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_volume_tag.png
___________________________________________________________________
Added: svn:mime-type
7075 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_options_bg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_options_bg.png
___________________________________________________________________
Added: svn:mime-type
7176 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/logo2.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/logo2.png
___________________________________________________________________
Added: svn:mime-type
7277 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_bg_normal.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_bg_normal.png
___________________________________________________________________
Added: svn:mime-type
7378 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_bg_loaded.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_bg_loaded.png
___________________________________________________________________
Added: svn:mime-type
7479 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_pause.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_pause.png
___________________________________________________________________
Added: svn:mime-type
7580 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/pelosi.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/pelosi.jpg
___________________________________________________________________
Added: svn:mime-type
7681 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/search_suggest_top.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/search_suggest_top.png
___________________________________________________________________
Added: svn:mime-type
7782 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_options_top.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_options_top.png
___________________________________________________________________
Added: svn:mime-type
7883 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/img1.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/img1.jpg
___________________________________________________________________
Added: svn:mime-type
7984 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/search_suggest_bottom.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/search_suggest_bottom.png
___________________________________________________________________
Added: svn:mime-type
8085 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/img2.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/img2.jpg
___________________________________________________________________
Added: svn:mime-type
8186 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_bottom_left.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_bottom_left.png
___________________________________________________________________
Added: svn:mime-type
8287 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/tracker.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/tracker.png
___________________________________________________________________
Added: svn:mime-type
8388 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb1.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb1.jpg
___________________________________________________________________
Added: svn:mime-type
8489 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_top_right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_top_right.png
___________________________________________________________________
Added: svn:mime-type
8590 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb2.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb2.jpg
___________________________________________________________________
Added: svn:mime-type
8691 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb3.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb3.jpg
___________________________________________________________________
Added: svn:mime-type
8792 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_slider.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_slider.png
___________________________________________________________________
Added: svn:mime-type
8893 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb4.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/thumb4.jpg
___________________________________________________________________
Added: svn:mime-type
8994 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_play.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_play.png
___________________________________________________________________
Added: svn:mime-type
9095 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_right.png
___________________________________________________________________
Added: svn:mime-type
9196 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_options.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_options.png
___________________________________________________________________
Added: svn:mime-type
9297 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_video_options_bg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_video_options_bg.png
___________________________________________________________________
Added: svn:mime-type
9398 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_top_left.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_top_left.png
___________________________________________________________________
Added: svn:mime-type
9499 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_right.png
___________________________________________________________________
Added: svn:mime-type
95100 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_play.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_button_play.png
___________________________________________________________________
Added: svn:mime-type
96101 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_subscribe.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/button_subscribe.png
___________________________________________________________________
Added: svn:mime-type
97102 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/ico_mail.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/ico_mail.png
___________________________________________________________________
Added: svn:mime-type
98103 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_bottom_right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_bottom_right.png
___________________________________________________________________
Added: svn:mime-type
99104 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_left.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_seek_left.png
___________________________________________________________________
Added: svn:mime-type
100105 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/search_suggest_bg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/search_suggest_bg.png
___________________________________________________________________
Added: svn:mime-type
101106 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/selector.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/selector.png
___________________________________________________________________
Added: svn:mime-type
102107 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/person1.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/person1.jpg
___________________________________________________________________
Added: svn:mime-type
103108 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/other_results_top.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/other_results_top.png
___________________________________________________________________
Added: svn:mime-type
104109 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/embed_arrow.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/embed_arrow.png
___________________________________________________________________
Added: svn:mime-type
105110 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/flash_carousel.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/flash_carousel.jpg
___________________________________________________________________
Added: svn:mime-type
106111 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_left.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/carousel_left.png
___________________________________________________________________
Added: svn:mime-type
107112 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_volume_seek.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_volume_seek.png
___________________________________________________________________
Added: svn:mime-type
108113 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_options_bottom.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/images/player_options_bottom.png
___________________________________________________________________
Added: svn:mime-type
109114 + application/octet-stream
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/ie_styles.css
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/ie_styles.css
___________________________________________________________________
Added: svn:eol-style
110115 + native
Index: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css
@@ -0,0 +1,454 @@
 2+#overlay {
 3+ background:transparent url(images/transparent_bg.png) repeat scroll 0 0;
 4+ cursor:wait;
 5+ height:100%;
 6+ left:0;
 7+ position:fixed;
 8+ top:0;
 9+ width:100%;
 10+ z-index:99;
 11+}
 12+
 13+#modalbox.editor {
 14+ background:#262626 none repeat scroll 0 0;
 15+ border:3px solid #666666;
 16+ left:10%;
 17+ top:10%;
 18+ position:fixed;
 19+ width:80%;
 20+ height:80%;
 21+ z-index:100;
 22+ color:#fff;
 23+}
 24+
 25+.mv_track {
 26+ margin-bottom:20px;
 27+ position:relative;
 28+}
 29+.player_select_list {
 30+ color:white;
 31+ font-size:10pt;
 32+/* display:none;*/
 33+}
 34+
 35+.player_select_list a:visited {
 36+ color:white;
 37+}
 38+.displayHTML a:visited {
 39+ color:white;
 40+}
 41+.mv_playhead {
 42+ position:absolute;
 43+ top:0;
 44+ left:0;
 45+ width:17px;
 46+ height:21px;
 47+ /*http://art.gnome.org/themes/gtk2*/
 48+}
 49+.mv_status {
 50+ font-family:"Times New Roman", Times, serif;
 51+ font-size:14px;
 52+ float:left;
 53+}
 54+.set_ogg_player_pref{
 55+ text-align:left;
 56+}
 57+
 58+.inputTrackerInput {
 59+ height:20;
 60+ width:30;
 61+ font-family : Arial, Helvetica, sans-serif;
 62+ font-size : 12px;
 63+}
 64+.mv_loading_icon {
 65+ position:absolute;
 66+ top:0px;
 67+ right:0px;
 68+ width:16px;
 69+ height:16px;
 70+}
 71+div.floatleft, table.floatleft {
 72+ border:0pt none;
 73+ clear:left;
 74+ float:left;
 75+ margin:0pt 0.5em 0.5em 0pt;
 76+ position:relative;
 77+}
 78+
 79+
 80+
 81+
 82+.videoPlayer
 83+{
 84+ color: #474747;
 85+ background: white;
 86+}
 87+
 88+.videoPlayer a:link {color: #2060c1; text-decoration: underline;}
 89+.videoPlayer a:visited {color: #2060c1; text-decoration: underline;}
 90+/*a:visited {color: #75a5e4; text-decoration: underline;}*/ /*Not sure if you want this*/
 91+.videoPlayer a:hover {color: #75a5e4; text-decoration: underline;}
 92+.videoPlayer img, .videoPlayer img a, .videoPlayer img a:hover {border: 0;}
 93+
 94+.videoPlayer h1, h2, h3, h4, h5, h6 {color: #242424; margin: 5px 0; padding: 0;}
 95+.videoPlayer h1 {font-size: 24px;}
 96+.videoPlayer h2 {font-size: 18px;}
 97+.videoPlayer h3 {font-size: 16px;}
 98+.videoPlayer h4 {font-size: 14px;}
 99+.videoPlayer h5 {font-size: 13px; text-align: center;}
 100+.videoPlayer h6 {font-size: 13px; color: #6c6c6c; padding: 10px 20px 0px 20px; text-transform: uppercase;}
 101+
 102+
 103+/*Video player*/
 104+.videoPlayer {
 105+/* width: 100%;*/
 106+ color: white;
 107+}
 108+.videoPlayerSmall {
 109+/* width: 439px;*/
 110+ height: 334px;
 111+}
 112+.videoPlayer .video {
 113+ display: block;
 114+ position: relative;
 115+ font-size: 1px;
 116+ height: 305px;
 117+}
 118+.videoPlayer .controls {
 119+ height: 29px;
 120+ background: #454545;
 121+ display:block;
 122+}
 123+.videoPlayer .controlInnerSmall {
 124+/* width: 430px;*/
 125+ height: 29px;
 126+ float: left;
 127+ display: inline;
 128+}
 129+.videoPlayer .controls span.border_left {background: url(images/player_bottom_left.png) 0 0 no-repeat; width: 4px; height: 29px; float: left; display: inline;}
 130+.videoPlayer .controls span.border_right {background: url(images/player_bottom_right.png) 0 0 no-repeat; width: 4px; height: 29px; float: right; display: inline;}
 131+
 132+.videoPlayer .pause_button {
 133+ width: 24px;
 134+ height: 29px;
 135+ padding: 0 3px;
 136+ border-right: 1px solid #8a8a8a;
 137+ cursor: pointer;
 138+ float: left;
 139+ display: inline;
 140+ background: url(images/player_button_pause.png) 2px 0 no-repeat;
 141+}
 142+
 143+.videoPlayer .play_button {
 144+ width: 24px;
 145+ height: 29px;
 146+ padding: 0 3px;
 147+ border-right: 1px solid #8a8a8a;
 148+ cursor: pointer;
 149+ float: left;
 150+ display: inline;
 151+ background: url(images/player_button_play.png) 2px 0 no-repeat;
 152+}
 153+.controls a{
 154+ display: block;
 155+ height: 100%;
 156+ width: 100%;
 157+}
 158+.videoPlayer .volume_icon {
 159+ float: right;
 160+ display: inline;
 161+ width: 22px;
 162+ height: 29px;
 163+ padding: 0 0 0 0;
 164+
 165+}
 166+.volume_on {
 167+ background: url(images/player_volume_tag.png) 0 8px no-repeat;
 168+}
 169+.volume_off{
 170+ background: url(images/player_volume_tag_off.png) 0 8px no-repeat;
 171+}
 172+
 173+.videoPlayer .volume_control {
 174+ width: 42px;
 175+ height: 12px;
 176+ margin: 9px 4px 0 0;
 177+ float: right;
 178+ display: inline;
 179+ background: url(images/player_volume_seek.png) 0 0 no-repeat;
 180+}
 181+.videoPlayer .volume_knob {
 182+ background: url(images/player_slider.png) 0 0 no-repeat;
 183+ width: 14px;
 184+ height: 14px;
 185+ position: absolute;
 186+ z-index: 2;
 187+ margin: -1px 0 0 3px;
 188+ cursor: pointer;
 189+}
 190+
 191+.videoPlayer .closed_captions {
 192+ background: url(images/player_button_cc.png) 0 0 no-repeat;
 193+ height: 20px;
 194+ width: 28px;
 195+ cursor: pointer;
 196+ float: right;
 197+ display: inline;
 198+ margin: 4px 6px 0 6px;
 199+}
 200+.videoPlayer .options {
 201+ background: url(images/player_button_options.png) 0 0 no-repeat;
 202+ height: 20px;
 203+ width: 20px;
 204+ cursor: pointer;
 205+ float: right;
 206+ display: inline;
 207+ margin: 4px 6px 0 0;
 208+}
 209+.videoPlayer .fullscreen {
 210+ background: url(images/player_button_fullscreen.png) 0 0 no-repeat;
 211+ height: 20px;
 212+ width: 20px;
 213+ cursor: pointer;
 214+ float: right;
 215+ display: inline;
 216+ margin: 4px 0 0 0;
 217+}
 218+
 219+.videoPlayer .time {
 220+ line-height: 32px;
 221+ height: 29px;
 222+ overflow: visible;
 223+ font-size: 11px;
 224+ width: 80px;
 225+ float: right;
 226+ display: inline;
 227+ font-family:arial;
 228+}
 229+
 230+.videoPlayer .seeker {
 231+ float: right;
 232+ display: inline;
 233+/* width: 55%;*/
 234+ margin: 0 5px 0 5px;
 235+ height: 29px;
 236+}
 237+
 238+.videoPlayer .seeker .seeker_bar {
 239+ float: left;
 240+ display: inline;
 241+ width : 100%;
 242+ height: 12px;
 243+ background: url(images/player_seek_bg_loaded.png) 0 1px repeat-x;
 244+ margin: 9px 0px 0 0px;
 245+ position:relative;
 246+}
 247+.videoPlayer .seeker .seeker_bar_outer {
 248+ width: 100%;
 249+ height: 12px;
 250+ position: relative;
 251+ z-index: 1;
 252+ background: url(images/player_seek_left.png) 0 0 no-repeat;
 253+}
 254+.videoPlayer .seeker .seeker_bar_close {
 255+ width: 5px;
 256+ height: 12px;
 257+ position: relative;
 258+ z-index: 1;
 259+ float: right;
 260+ display: inline;
 261+ margin: -13px 0 0 0;
 262+ background: url(images/player_seek_right.png) 0 0 no-repeat;
 263+}
 264+
 265+.videoPlayer .seeker .seeker_slider {
 266+ background: url(images/player_slider.png) 0 0 no-repeat;
 267+ width: 14px;
 268+ height: 14px;
 269+ position: relative;
 270+ z-index: 2;
 271+ margin: -13px 0 0 0px;
 272+ cursor: pointer;
 273+}
 274+
 275+.large_play_button {
 276+ background: url(images/player_big_play_button.png) 0 0 no-repeat;
 277+ display:block;
 278+ width: 130px;
 279+ height: 96px;
 280+ margin: auto;
 281+/* margin: -202px 0 0 154px;*/
 282+ position: absolute;
 283+ z-index: 3;
 284+ cursor: pointer;
 285+}
 286+
 287+/*Video options*/
 288+.videoOptions {
 289+ display: none;
 290+ width: 183px;
 291+ overflow: hidden;
 292+ position: absolute;
 293+ z-index: 2;
 294+/* margin: 0 0 0 230px;*/
 295+}
 296+*:first-child+html .videoOptions {margin-top: -20px;}
 297+.videoOptionsTop {
 298+ width: 183px;
 299+ height: 32px;
 300+ position: relative;
 301+ z-index: 3;
 302+ background: url(images/player_options_top.png) 0 0 no-repeat;
 303+}
 304+.videoOptionsBox {
 305+ width: 170px;
 306+ padding: 0px 11px 0 4px;
 307+ position: relative;
 308+ overflow: hidden;
 309+ color:#6C6C6C;
 310+ z-index: 3;
 311+ background: url(images/player_options_bg.png) 0 0 repeat-y;
 312+}
 313+.videoOptionsBot {
 314+ width: 183px;
 315+ height: 18px;
 316+ position: relative;
 317+ z-index: 3;
 318+ background: url(images/player_options_bottom.png) 0 0 no-repeat;
 319+}
 320+
 321+.videoOptionsBox div.block {
 322+ border-top: 1px solid #dadada;
 323+}
 324+.videoOptionsBox div.block h6 {
 325+ padding: 0;
 326+ margin: 5px 0;
 327+ text-align: center;
 328+}
 329+.videoOptionsBox div.wide_block {
 330+ padding: 15px 0;
 331+}
 332+.videoOptionsBox div.first_block {
 333+ border: 0;
 334+}
 335+.videoOptionsBox div.block p {padding: 10px 20px;margin: 0;}
 336+.videoOptionsBox div.block p.short_match, .videoOptionsBox div.block p.normal_match {padding: 0; margin: 0;}
 337+.videoOptionsBox div.block p a {text-decoration: none;}
 338+.videoOptionsBox div.block p.short_match a {
 339+ padding: 0;
 340+ display: block;
 341+ width: 100%;
 342+ border-bottom: 1px solid #dadada;
 343+}
 344+.videoOptionsBox div.block p.short_match a span {display: block; padding: 5px 20px;}
 345+.videoOptionsBox div.block p.short_match a:hover {background: #0b68c9 url(images/selector.png) 0 0 repeat-x; color: white;}
 346+.videoOptionsBox div.block p.short_match a.last_match {border: 0;}
 347+
 348+.videoOptionsBox div.block p.normal_match a {
 349+ padding: 0;
 350+ margin: 0;
 351+ display: block;
 352+ width: 100%;
 353+ border: 0;
 354+}
 355+.videoOptionsBox div.block p.normal_match a span {display: block; padding: 3px 20px;}
 356+.videoOptionsBox div.block p.normal_match a:hover {background: #0b68c9 url(images/selector.png) 0 0 repeat-x; color: white;}
 357+.videoOptionsBox div.block p.normal_match a.last_match {border: 0;}
 358+
 359+.videoOptionsBox div.block p.bill_match {border-bottom: 1px solid #dadada;}
 360+
 361+.videoOptionsBox div.block p.last_match {border-bottom: 0;}
 362+
 363+.videoOptionsBox div.block ul {
 364+ list-style: none;
 365+ margin: 10px 0;
 366+ padding: 0 20px;
 367+}
 368+.videoOptionsBox div.block ul a {text-decoration: none;}
 369+.videoOptionsBox div.block ul li {margin: 7px 0;}
 370+.videoOptionsBox div.block ul li ul {margin: 0;}
 371+.videoOptionsBox div.block ul li ul li a {color: #df5c01;}
 372+.videoOptionsBox div.block ul li ul li a:hover {color: #ffa02f;}
 373+
 374+.videoOptionsBox div.block ul li span.clips {display: block; text-align: right; margin: 6px 0 18px 0;}
 375+
 376+.videoOptionsBox div.advanced a.advanced_options {color: #aaa; text-align: center; display: block; margin: 3px 0; text-decoration: none;}
 377+
 378+.videoOptionsBox div.embed_code {text-align: center; border-bottom: 1px solid #dadada; }
 379+.videoOptionsBox div.embed_code textarea {
 380+ margin: 10px 0 10px 0;
 381+ padding: 3px;
 382+ width: 142px;
 383+ height: 54px;
 384+ border: 1px solid #dadada;
 385+ font-family: Arial;
 386+ color: #777;
 387+ font-size: 11px;
 388+}
 389+.videoOptionsBox div.embed_code button.copy_to_clipboard {
 390+ background: #dddddd url(images/button_to_clipboard.png) 0 0 repeat-x;
 391+ border: 1px solid #a1badf;
 392+ text-align: center;
 393+ padding: 2px 4px;
 394+ margin: 0 0 6px 0;
 395+}
 396+
 397+.videoComplete {
 398+/* width: 100%;
 399+ height: 100%;*/
 400+ background: url(images/transparent_bg.png) 0 0 repeat;
 401+ position: absolute;
 402+ top:0px;
 403+ left:0px;
 404+ z-index: 10;
 405+ font-size:16px;
 406+ overflow: hidden;
 407+}
 408+
 409+/* margin: -305px 0 0 0; */
 410+.videoComplete .videoOptionsComplete {
 411+ background:transparent url('images/player_video_options_bg.png') no-repeat scroll 0pt;
 412+ color:#7A7A7A;
 413+ font-size:10pt;
 414+ height:158px;
 415+ left:10%;
 416+ overflow:auto;
 417+ padding:19px;
 418+ position:relative;
 419+ top:16%;
 420+ width:283px;
 421+}
 422+.videoComplete .videoOptionsComplete p {text-align: center; margin: 3px 0; padding: 0;}
 423+.videoComplete .videoOptionsComplete a {
 424+ color: white;
 425+/* font-size: 22px;*/
 426+ font-size:12px;
 427+ text-decoration: underline;
 428+}
 429+
 430+.videoComplete .videoOptionsComplete a.email {
 431+ font-size:16px;
 432+ background: url(images/ico_mail.png) right 0px no-repeat;
 433+ padding: 0 50px 0 0;
 434+}
 435+
 436+.videoComplete div.embed_code textarea {
 437+ margin: 8px 0 8px 0;
 438+ padding: 3px;
 439+ width: 258px;
 440+ height: 54px;
 441+ border: 1px solid #dadada;
 442+ font-family: Arial;
 443+ color: #777;
 444+ font-size: 11px;
 445+}
 446+.videoComplete div.embed_code button.copy_to_clipboard {
 447+ background: #dddddd url(images/button_to_clipboard.png) 0 0 repeat-x;
 448+ border: 1px solid #3b4552;
 449+ text-align: center;
 450+ padding: 2px 4px;
 451+ margin: 0 0 6px 0;
 452+ float: right;
 453+ display: inline;
 454+}
 455+
Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed/skins/mvpcf/styles.css
___________________________________________________________________
Added: svn:eol-style
1456 + native
Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
@@ -15,26 +15,36 @@
1616 *
1717 */
1818 var MV_EMBED_VERSION = '1.0rc1';
 19+
 20+//if you want to foce the path to the mv_embed folder
1921 var mv_embed_path = null;
 22+
 23+//the name of the player skin (default is mvpcf)
 24+var mv_skin_name = 'mvpcf';
 25+
2026 //whether or not to load java from an iframe.
2127 //note: this is necessary for remote embedding because of java security model)
2228 var mv_java_iframe = true;
 29+
 30+//ogg chop links ( removes .anx from stream) should be deprecated shortly
2331 var ogg_chop_links = true;
 32+
2433 //media_server mv_embed_path (the path on media servers to mv_embed for java iframe with leading and trailing slashes)
2534 var mv_media_iframe_path = '/mv_embed/';
2635
 36+//the default height/width of the vidoe (if no style or width parm provided)
 37+var mv_default_video_size = '400x300';
 38+
 39+//this restricts playable sources to ROE xml media without start end time atttribute
 40+var mv_restrict_roe_time_source = true;
 41+
 42+
2743 var global_ogg_list = new Array();
2844 var global_req_cb = new Array();//the global request callback array
2945 var _global = this;
3046 var mv_init_done=false;
3147
32 -//this restricts playable sources to ROE xml media without start end time atttribute
33 -var mv_restrict_roe_time_source = true;
3448
35 -//the default height/width of the vidoe (if no style or width parm provided)
36 -var mv_default_video_size = '400x300';
37 -
38 -var debug_global_vid_ref=null;
3949 /*
4050 * its best if you just require all your external data sources to serve up json data.
4151 * or
@@ -167,17 +177,18 @@
168178 libs_loaded:false,
169179 //plugin libs var names and paths:
170180 lib_jquery:{'window.jQuery':'jquery/jquery-1.2.6.min.js'},
171 - lib_plugins:{
172 - '$j.timer.global':'jquery/plugins/jquery.timers.js', //we should try and factor out the timer
 181+ lib_plugins:{
173182 '$j.ui.mouse' :'jquery/jquery.ui-1.5.2/ui/minified/ui.core.min.js'
174183 },
 184+ // not used:
 185+ //'$j.timer.global':'jquery/plugins/jquery.timers.js',
175186 lib_controlui:{
176187 '$j.ui.droppable':'jquery/jquery.ui-1.5.2/ui/minified/ui.droppable.min.js',
177 - '$j.ui.draggable':'jquery/jquery.ui-1.5.2/ui/minified/ui.draggable.min.js',
178 - '$j.ui.resizable':'jquery/jquery.ui-1.5.2/ui/minified/ui.resizable.min.js'
 188+ '$j.ui.draggable':'jquery/jquery.ui-1.5.2/ui/minified/ui.draggable.min.js'
179189 },
180190 /* @@todo move to single packaged jquery ui library:
181191 , //include draggable
 192+ '$j.ui.resizable':'jquery/jquery.ui-1.5.2/ui/minified/ui.resizable.min.js'
182193 '$j.ui.progressbar':'jquery/jquery-ui-personalized-1.6rc1.debug.js'
183194 */
184195 pc:null, //used to store pointer to parent clip (when in playlist mode)
@@ -210,11 +221,9 @@
211222 this.flist.push(fn);
212223 },
213224 init: function(){
214 - //load css:
215 - if(!styleSheetPresent(mv_embed_path+'mv_embed.css'))
216 - loadExternalCss(mv_embed_path+'mv_embed.css');
217 - if(!styleSheetPresent(mv_embed_path+'skin/styles.css'))
218 - loadExternalCss(mv_embed_path+'skin/styles.css');
 225+ //load mv_embed skin stylesheet:
 226+ if(!styleSheetPresent(mv_embed_path+'skins/'+mv_skin_name+'/styles.css'))
 227+ loadExternalCss(mv_embed_path+'skins/'+mv_skin_name+'/styles.css');
219228
220229 //call the callback:
221230 if(this.load_callback)this.load_callback();
@@ -267,60 +276,34 @@
268277 if(this.loaded)
269278 {
270279 js_log('plugin loaded, scheduling immediate processing');
271 - $j(document).oneTime(1, callback);
 280+ callback();
272281 }
273282 else
274283 {
275 - js_log('plugin not loaded, queing callback');
276 - this.loading_callbacks.push(callback);
277 - if(this.loading_callbacks.length==1)
278 - {
279 - var plugin_path = mv_embed_path + 'embedLibs/mv_'+this.library+'Embed.js';
280 - js_log('requesting plugin: ' + plugin_path);
281 - var _this = this;
282 - //swaped for doLoad so that we use cache
283 - // getScript has cache disabled for some reason (probably could be set up at init to cache)
284 -
285 - //I am getting vlEmebed is not defined like 1/5 or 1/20th the time
286 - //the load order should be more defined and ordered via callbacks
287 - $j.getScript(plugin_path, function(){
288 - js_log(_this.id + ' plugin loaded');
289 - _this.execute_callbacks();
290 - });
291 -/* eval('var lib = {"'+this.library+'Embed":\'embedLibs/mv_'+this.library+'Embed.js\'}');
292 - mvJsLoader.doLoad(lib,function(){
293 - js_log(_this.id + ' plugin loaded');
294 - _this.loaded = true;
295 - //callback();
296 - for(var i in _this.loading_callbacks)
297 - _this.loading_callbacks[i]();
298 - _this.loading_callbacks = null;
299 - });*/
300 - }
301 - }
302 - },
303 - execute_callbacks : function()
304 - {
305 - // make sure the object exists
306 - if(eval('typeof '+this.library + 'Embed')!='undefined')
307 - {
308 - js_log(this.id + ' executing callbacks');
309 - this.loaded = true;
310 - for(var i in this.loading_callbacks)
311 - this.loading_callbacks[i]();
312 - this.loading_callbacks = null;
313 - }
314 - else
315 - {
316 - js_log(this.id + ' object not present, delay callbacks');
317 - // if not, wait a little
318284 var _this = this;
319 - $j(document).oneTime(25, function()
320 - {
321 - _this.execute_callbacks();
 285+ var plugin_path = mv_embed_path + 'embedLibs/mv_'+this.library+'Embed.js';
 286+ //add the callback:
 287+ this.loading_callbacks.push(callback);
 288+
 289+
 290+ js_log('plugin not loaded, queing callback');
 291+ js_log('requesting plugin: ' + plugin_path);
 292+ /*$j.getScript(plugin_path, function(){
 293+ js_log(_this.id + ' plugin loaded');
 294+ _this.loaded = true;
 295+ callback();
 296+ });*/
 297+ eval('var lib = {"'+this.library+'Embed":\'embedLibs/mv_'+this.library+'Embed.js\'}');
 298+ mvJsLoader.doLoad(lib,function(){
 299+ js_log(_this.id + ' plugin loaded');
 300+ _this.loaded = true;
 301+ for(var i in _this.loading_callbacks)
 302+ _this.loading_callbacks[i]();
 303+ _this.loading_callbacks = null;
 304+
322305 });
323306 }
324 - }
 307+ }
325308 }
326309
327310 var flowPlayer = new mediaPlayer('flowplayer',['video/x-flv'],'flash');
@@ -942,8 +925,7 @@
943926 video_elements = document.getElementsByTagName("video");
944927 //js_log('found video '+ video_elements.length);
945928 if( video_elements.length > 0) {
946 - for(var i = 0; i < video_elements.length; i++) {
947 - debug_global_vid_ref =video_elements[i];
 929+ for(var i = 0; i < video_elements.length; i++) {
948930 //grab id:
949931 vid_id = $j(video_elements[i]).attr("id");
950932 //set id if empty:
@@ -1422,6 +1404,7 @@
14231405 this.src = $j(element).attr('src');
14241406 if(ogg_chop_links)
14251407 this.src = this.src.replace(".anx", '');
 1408+
14261409 this.marked_default = false;
14271410
14281411 var tag = element.tagName.toLowerCase();
@@ -2491,7 +2474,7 @@
24922475
24932476 //fix for IE<7 and its lack of PNG support:
24942477 out+=getTransparentPng(new Object ({id:'play_'+id, width:play_btn_width, height:play_btn_height, border:"0",
2495 - src:mv_embed_path + '/skin/images/player_big_play_button.png' }));
 2478+ src:mv_embed_path + '/skins/'+mv_skin_name+'/images/player_big_play_button.png' }));
24962479 out+='</a></div>';
24972480 return out;*/
24982481 },
@@ -2807,35 +2790,6 @@
28082791 return true;
28092792 }
28102793 },
2811 - //loads in the css and js for the extended interface (controls = true)
2812 - //depricated
2813 - /*get_interface_lib : function(doLoad){
2814 - //var doLoad = (doLoad==null)? true:doLoad;
2815 - //js_log('get interface:' + doLoad);
2816 - var loading_interface =false;
2817 -
2818 - //grab the css file:
2819 - if(!styleSheetPresent(mv_embed_path+'mv_embed.css')){
2820 - if(doLoad) loadExternalCss(mv_embed_path+'mv_embed.css');
2821 - js_log('css und');
2822 - loading_interface=true;
2823 - }
2824 - if(loading_interface){
2825 - //call get_interface_lib (without requests) until interface is done loading:
2826 - setTimeout('document.getElementById(\''+this.id+'\').get_interface_lib(false)', 50);
2827 - //if loading interface is not yet available
2828 - return false;
2829 - }else{
2830 - //js_log('loading_interface = false');
2831 - //if it was a load request and it was already loaded return true
2832 - if(doLoad){
2833 - return true;
2834 - }else{
2835 - //non loading request means time has passed so we need to update the innerHTML
2836 - this.doEmbedHTML();
2837 - }
2838 - }
2839 - },*/
28402794 playlistSupport:function(){
28412795 //by default not supported (implemented in js)
28422796 return false;
Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_playlist.js
@@ -135,6 +135,14 @@
136136 //grab "options" use current clip:
137137 this.cur_clip.embed.doOptionsHTML();
138138 },
 139+ //pulls up the video editor inline
 140+ doEditor:function(){
 141+ //black out the page:
 142+ $j('body').append('<div id="overlay"/> '+
 143+ '<div id="modalbox" class="editor">');
 144+ $j('#modalbox').html('loading editor<blink>...</blink>');
 145+
 146+ },
139147 selectPlaybackMethod:function(){
140148 this.cur_clip.embed.selectPlaybackMethod();
141149 },
@@ -207,7 +215,7 @@
208216 this.getHTML();
209217 }else{
210218 js_log("only "+ _this.clip_ready_count +" clips done, scheduling callback:");
211 - setTimeout('document.getElementById(\''+this.id+'\').doWhenParseDone(false)', 250);
 219+ setTimeout('document.getElementById(\''+this.id+'\').doWhenParseDone()', 250);
212220 }
213221 },
214222 doWhenClipLoadDone:function(){
@@ -439,7 +447,8 @@
440448 $j('#ptitle_'+this.id).html(''+
441449 '<b>' + this.title + '</b> '+
442450 this.getClipCount()+' clips, <i>'+
443 - seconds2ntp( this.getDuration() ) + '</i>' );
 451+ seconds2ntp( this.getDuration() ) + '</i>' +
 452+ '<a href="#" onclick="$j(\'#'+this.id+'\').get(0).doEditor();" style="float:right">edit</a>');
444453 //update status:
445454 this.setStatus('0:0:00/'+seconds2ntp( this.getDuration() ));
446455 },