| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/mv_embed.js |
| — | — | @@ -248,14 +248,15 @@ |
| 249 | 249 | { |
| 250 | 250 | players : null, |
| 251 | 251 | preference : null, |
| 252 | | - default_players : null, |
| | 252 | + default_players : null, |
| 253 | 253 | init : function() |
| 254 | 254 | { |
| 255 | 255 | this.players = new Array(); |
| 256 | 256 | this.loadPreferences(); |
| 257 | 257 | this.default_players = new Object(); |
| 258 | | - this.default_players['video/x-flv']= ['flowplayer','vlc']; |
| 259 | | - this.default_players['video/annodex']=['cortado','vlc']; |
| | 258 | + this.default_players['video/x-flv']= ['flash','vlc']; |
| | 259 | + this.default_players['video/ogg']=['native','vlc','java']; |
| | 260 | + this.default_players['video/mp4']=['vlc']; |
| 260 | 261 | }, |
| 261 | 262 | addPlayer : function(player, mime_type) |
| 262 | 263 | { |
| — | — | @@ -277,10 +278,15 @@ |
| 278 | 279 | getMIMETypePlayers : function(mime_type) |
| 279 | 280 | { |
| 280 | 281 | var mime_players = new Array(); |
| 281 | | - for (var i in this.players) |
| 282 | | - if (this.players[i].supportsMIMEType(mime_type)) |
| 283 | | - mime_players.push(this.players[i]); |
| 284 | | - |
| | 282 | + // @@TODO: optimize this loop |
| | 283 | + if(this.default_players[mime_type]) |
| | 284 | + for (var d in this.default_players[mime_type]) |
| | 285 | + { |
| | 286 | + var library = this.default_players[mime_type][d]; |
| | 287 | + for (var i in this.players) |
| | 288 | + if (this.players[i].library==library && this.players[i].supportsMIMEType(mime_type)) |
| | 289 | + mime_players.push(this.players[i]); |
| | 290 | + } |
| 285 | 291 | return mime_players; |
| 286 | 292 | }, |
| 287 | 293 | defaultPlayer : function(mime_type) |
| — | — | @@ -292,12 +298,8 @@ |
| 293 | 299 | for(var i in mime_players) |
| 294 | 300 | if(mime_players[i].id==this.preference[mime_type]) |
| 295 | 301 | return mime_players[i]; |
| 296 | | - // otherwise use the hard-coded preference list |
| 297 | | - for(var d in this.default_players) |
| 298 | | - for(var i in mime_players) |
| 299 | | - if(mime_players[i].id==this.default_players[d]) |
| 300 | | - return mime_players[i]; |
| 301 | 302 | // otherwise just return the first compatible player |
| | 303 | + // (it will be chosen according to the default_players list |
| 302 | 304 | return mime_players[0]; |
| 303 | 305 | } |
| 304 | 306 | js_log('No default player found for ' + mime_type); |
| — | — | @@ -2010,8 +2012,8 @@ |
| 2011 | 2013 | var retval = '<img src="'+image_src+'"/>'; |
| 2012 | 2014 | if(is_not_selected) |
| 2013 | 2015 | retval+='<a href="#" onClick="' + source_select_code + 'embedTypes.players.userSelectPlayer(\''+default_player.id+'\',\''+source.getMIMEType()+'\'); return false;">'; |
| 2014 | | - retval += source.getTitle()+' - ' + default_player.getName() + (is_not_selected?'</a>':'') + ' '; |
| 2015 | | - retval += '(<a href="#" onClick=\'$j("#player_select_list_'+index+'").fadeIn("slow");return false;\'>choose player</a>)' + player_code; |
| | 2016 | + retval += source.getTitle()+/*' - ' + default_player.getName() +*/ (is_not_selected?'</a>':'') + ' '; |
| | 2017 | + retval += /*'(<a href="#" onClick=\'$j("#player_select_list_'+index+'").fadeIn("slow");return false;\'>choose player</a>)' +*/ player_code; |
| 2016 | 2018 | return retval; |
| 2017 | 2019 | } |
| 2018 | 2020 | else |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb3.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb3.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2019 | 2021 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb4.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb4.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2020 | 2022 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_play.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_play.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2021 | 2023 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_top_left.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_top_left.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2022 | 2024 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_right.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_right.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2023 | 2025 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_subscribe.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_subscribe.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2024 | 2026 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/ico_mail.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/ico_mail.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2025 | 2027 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/search_suggest_bg.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/search_suggest_bg.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2026 | 2028 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/selector.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/selector.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2027 | 2029 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/person1.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/person1.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2028 | 2030 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/other_results_top.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/other_results_top.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2029 | 2031 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/embed_arrow.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/embed_arrow.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2030 | 2032 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/flash_carousel.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/flash_carousel.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2031 | 2033 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_left.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_left.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2032 | 2034 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_to_clipboard.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_to_clipboard.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2033 | 2035 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_grey_right.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_grey_right.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2034 | 2036 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/logo.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/logo.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2035 | 2037 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/ico_rss.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/ico_rss.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2036 | 2038 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/flash_player.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/flash_player.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2037 | 2039 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/other_results_top2.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/other_results_top2.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2038 | 2040 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/transparent_bg.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/transparent_bg.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2039 | 2041 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/other_results_bg.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/other_results_bg.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2040 | 2042 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_grey_left.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/button_grey_left.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2041 | 2043 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/logo2.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/logo2.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2042 | 2044 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/pelosi.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/pelosi.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2043 | 2045 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/search_suggest_top.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/search_suggest_top.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2044 | 2046 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/img1.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/img1.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2045 | 2047 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/search_suggest_bottom.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/search_suggest_bottom.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2046 | 2048 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/img2.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/img2.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2047 | 2049 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/tracker.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/tracker.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2048 | 2050 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_top_right.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/carousel_top_right.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2049 | 2051 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb1.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb1.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2050 | 2052 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb2.jpg |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/images/thumb2.jpg |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2051 | 2053 | + application/octet-stream |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/styles.css |
| — | — | @@ -314,22 +314,25 @@ |
| 315 | 315 | left:0px; |
| 316 | 316 | z-index: 10; |
| 317 | 317 | overflow: hidden; |
| | 318 | +} |
| | 319 | + |
| 318 | 320 | /* margin: -305px 0 0 0; */ |
| 319 | | -} |
| 320 | 321 | .videoComplete .videoOptionsComplete { |
| 321 | 322 | background: url(images/player_video_options_bg.png) 0 0 no-repeat; |
| 322 | 323 | width: 266px; |
| 323 | 324 | height: 172px; |
| 324 | 325 | margin: 5px auto; |
| 325 | 326 | padding: 12px 19px; |
| 326 | | - font-size: 14px; |
| | 327 | +/* font-size: 14px;*/ |
| | 328 | + font-size:10pt; |
| 327 | 329 | overflow: auto; |
| 328 | 330 | color: #7a7a7a; |
| 329 | 331 | } |
| 330 | 332 | .videoComplete .videoOptionsComplete p {text-align: center; margin: 3px 0; padding: 0;} |
| 331 | 333 | .videoComplete .videoOptionsComplete a { |
| 332 | 334 | color: white; |
| 333 | | - font-size: 22px; |
| | 335 | +/* font-size: 22px;*/ |
| | 336 | + font-size:12px; |
| 334 | 337 | text-decoration: none; |
| 335 | 338 | } |
| 336 | 339 | .videoComplete .videoOptionsComplete a.email {background: url(images/ico_mail.png) right 0px no-repeat; padding: 0 50px 0 0;} |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/mv_embed.css |
| — | — | @@ -5,8 +5,9 @@ |
| 6 | 6 | .player_select_list { |
| 7 | 7 | color:white; |
| 8 | 8 | font-size:10pt; |
| 9 | | - display:none; |
| | 9 | +/* display:none;*/ |
| 10 | 10 | } |
| | 11 | + |
| 11 | 12 | .player_select_list a:visited { |
| 12 | 13 | color:white; |
| 13 | 14 | } |