| Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
| — | — | @@ -123,10 +123,8 @@ |
| 124 | 124 | $wgAutoloadClasses['MV_ImageGallery'] = dirname( __FILE__ ) . '/MV_ImageGallery.php'; |
| 125 | 125 | $wgAutoloadClasses['MV_Image'] = dirname( __FILE__ ) . '/MV_Image.php'; |
| 126 | 126 | $wgAutoloadClasses['MV_Stream'] = dirname( __FILE__ ) . '/MV_Stream.php'; |
| 127 | | - $wgAutoloadClasses['MV_StreamFile'] = dirname( __FILE__ ) . '/MV_StreamFile.php'; |
| | 127 | + $wgAutoloadClasses['MV_StreamFile'] = dirname( __FILE__ ) . '/MV_StreamFile.php'; |
| 128 | 128 | |
| 129 | | - $wgAutoloadClasses['mvOggHandler'] = dirname( __FILE__ ) . '/MV_OggHandler.php'; |
| 130 | | - |
| 131 | 129 | $wgAutoloadClasses['MV_StreamImage'] = dirname( __FILE__ ) . '/MV_StreamImage.php'; |
| 132 | 130 | $wgAutoloadClasses['MV_ParserCache'] = dirname( __FILE__ ) . '/MV_ParserCache.php'; |
| 133 | 131 | $wgAutoloadClasses['MV_MagicWords'] = dirname( __FILE__ ) . '/MV_MagicWords.php'; |
| — | — | @@ -208,9 +206,10 @@ |
| 209 | 207 | * OggHandler extension overides |
| 210 | 208 | * if the OggHandler is included remap the object for copatibility with metavid |
| 211 | 209 | * MV_OggHandler.php hanndles all the re-mapping |
| 212 | | - */ |
| | 210 | + */ |
| 213 | 211 | global $wgMediaHandlers; |
| 214 | 212 | if($wgMediaHandlers['application/ogg'] == 'OggHandler'){ |
| | 213 | + $wgAutoloadClasses['mvOggHandler'] = dirname( __FILE__ ) . '/MV_OggHandler.php'; |
| 215 | 214 | $wgMediaHandlers['application/ogg']='mvOggHandler'; |
| 216 | 215 | $wgParserOutputHooks['OggHandler'] = array( 'mvOggHandler', 'outputHook' ); |
| 217 | 216 | foreach($wgHooks['LanguageGetMagic'] as & $hook_function){ |
| — | — | @@ -225,10 +224,9 @@ |
| 226 | 225 | } |
| 227 | 226 | } |
| 228 | 227 | } |
| 229 | | - } |
| | 228 | + } |
| 230 | 229 | |
| 231 | 230 | |
| 232 | | - |
| 233 | 231 | // $wgHooks['BeforePageDisplay'][] = 'mvDoSpecialPage'; |
| 234 | 232 | // $wgHooks['ArticleViewHeader'][] = 'mvArticleViewOpts'; |
| 235 | 233 | /**********************************************/ |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/embedLibs/mv_flashEmbed.js |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | } |
| 50 | 50 | }, |
| 51 | 51 | getEmbedHTML: function (){ |
| 52 | | - setTimeout('document.getElementById(\''+this.id+'\').postEmbedJS()', 150); |
| | 52 | + setTimeout('$j(\''+this.id+'\').get(0).postEmbedJS()', 150); |
| 53 | 53 | return this.wrapEmebedContainer( this.getEmbedObj() ); |
| 54 | 54 | }, |
| 55 | 55 | getEmbedObj:function(){ |
| — | — | @@ -76,8 +76,10 @@ |
| 77 | 77 | } |
| 78 | 78 | if (this.flashVars) { |
| 79 | 79 | html += 'flashvars=\''; |
| | 80 | + var and = ''; |
| 80 | 81 | for(var key in this.flashVars) { |
| 81 | | - html += [key] + '=' + asString(this.flashVars[key]) + '&'; |
| | 82 | + html +=and+ [key] + '=' + asString(this.flashVars[key]); |
| | 83 | + and = '&'; |
| 82 | 84 | } |
| 83 | 85 | html += '\''; |
| 84 | 86 | } |
| — | — | @@ -96,13 +98,16 @@ |
| 97 | 99 | } |
| 98 | 100 | if (this.flashVars) { |
| 99 | 101 | html += '\n\t<param name="flashvars" value=\''; |
| | 102 | + var and = ''; |
| 100 | 103 | for(var key in this.flashVars) { |
| 101 | | - html += [key] + '=' + asString(this.flashVars[key]) + '&'; |
| | 104 | + html += and + [key] + '=' + asString(this.flashVars[key]) ; |
| | 105 | + and = '&'; |
| 102 | 106 | } |
| 103 | 107 | html += '\' />'; |
| 104 | 108 | } |
| 105 | 109 | html += "</object>"; |
| 106 | 110 | } |
| | 111 | + js_log('embed code:'+ html); |
| 107 | 112 | return html; |
| 108 | 113 | }, |
| 109 | 114 | postEmbedJS: function() |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js |
| — | — | @@ -1790,7 +1790,13 @@ |
| 1791 | 1791 | }, |
| 1792 | 1792 | isPlayableType:function(mime_type) |
| 1793 | 1793 | { |
| 1794 | | - return mime_type=='video/ogg' || mime_type=='ogg/video' || mime_type=='video/annodex' || mime_type=='video/x-flv'; |
| | 1794 | + if(embedTypes.players.defaultPlayer(mime_type)){ |
| | 1795 | + return true; |
| | 1796 | + }else{ |
| | 1797 | + return false; |
| | 1798 | + } |
| | 1799 | + //if(this.selected_player){ |
| | 1800 | + //return mime_type=='video/ogg' || mime_type=='ogg/video' || mime_type=='video/annodex' || mime_type=='video/x-flv'; |
| 1795 | 1801 | }, |
| 1796 | 1802 | /** Adds a single mediaSource using the provided element if |
| 1797 | 1803 | the element has a 'src' attribute. |