| Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
| — | — | @@ -354,7 +354,6 @@ |
| 355 | 355 | $unique_req_param = MV_VERSION; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | | - /* (moved to on_dom ready) but here as well*/ |
| 359 | 358 | if( $wgEnableScriptLoader ){ |
| 360 | 359 | $debug_param = ( $mvgJSDebug || |
| 361 | 360 | $wgRequest->getVal('debug')=='true' || |
| Index: trunk/extensions/MetavidWiki/includes/MV_Index.php |
| — | — | @@ -444,8 +444,8 @@ |
| 445 | 445 | $dbr->tableName( 'mv_stream_files' ) . '.stream_id ' . |
| 446 | 446 | ' AND (' . $dbr->tableName( 'mv_stream_files' ) . '.file_desc_msg = ' . |
| 447 | 447 | $dbr->addQuotes( $mvDefaultVideoQualityKey ) . |
| 448 | | - ' OR '. $dbr->tableName( 'mv_stream_files' ) .'.file_desc_msg = ' . |
| 449 | | - $dbr->addQuotes( $mvDefaultFlashQualityKey ) . |
| | 448 | + //' OR '. $dbr->tableName( 'mv_stream_files' ) .'.file_desc_msg = ' . |
| | 449 | + // $dbr->addQuotes( $mvDefaultFlashQualityKey ) . |
| 450 | 450 | ')'. |
| 451 | 451 | ') '; |
| 452 | 452 | |
| Index: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php |
| — | — | @@ -631,17 +631,19 @@ |
| 632 | 632 | <?php echo mvRSSFeed::xmlEncode( $talkpage->getFullUrl() )?> |
| 633 | 633 | </comments> |
| 634 | 634 | <?php |
| | 635 | + |
| 635 | 636 | $person=''; |
| 636 | 637 | if($pmvd && $pmvd->Speech_by ){ |
| 637 | 638 | $personTitle = Title :: newFromText( $pmvd->Speech_by ); |
| 638 | 639 | ?> |
| 639 | | -<media:person label="<?php echo $personTitle->getText() ?>" url="<?php echo mvRSSFeed::xmlEncode( $personTitle->getFullURL() ); ?> |
| | 640 | +<media:person label="<?php echo $personTitle->getText() ?>" url="<?php echo mvRSSFeed::xmlEncode( $personTitle->getFullURL() ); ?>" /> |
| 640 | 641 | <?php |
| 641 | 642 | } |
| 642 | 643 | //handle any parent clip tag info: |
| 643 | 644 | if( $pmvd ){ ?> |
| 644 | 645 | <media:parent_clip label="<?php echo $parent_clip_desc ?>" url="<?php echo mvRSSFeed::xmlEncode( $pAnnoStreamTitle->getFullUrl() ) ?>" /> |
| 645 | | - <?php if( $pmvd->Bill ){ |
| | 646 | +<?php |
| | 647 | + if( $pmvd->Bill ){ |
| 646 | 648 | $bTitle = Title :: newFromText( $pmvd->Bill ); |
| 647 | 649 | ?> |
| 648 | 650 | <media:bill label="<?php echo $bTitle->getText() ?>" url="<?php echo mvRSSFeed::xmlEncode( $bTitle->getFullURL() );?>" /> |
| — | — | @@ -650,11 +652,12 @@ |
| 651 | 653 | foreach($pmvd->category as $cat_titlekey ){ |
| 652 | 654 | $cTitle = $cTitle = Title :: MakeTitle( NS_CATEGORY, $cat_titlekey ); |
| 653 | 655 | ?> |
| 654 | | - <media:category label="<?php echo $cTitle->getText()?>" url=<?php echo mvRSSFeed::xmlEncode( $cTitle->getFullUrl()) ?>" /> |
| 655 | | -<?php |
| | 656 | +<media:category label="<?php echo $cTitle->getText()?>" url="<?php echo mvRSSFeed::xmlEncode( $cTitle->getFullUrl()) ?>" /> |
| | 657 | +<?php |
| 656 | 658 | } |
| 657 | 659 | } |
| 658 | 660 | } |
| | 661 | + |
| 659 | 662 | ?> |
| 660 | 663 | <media:thumbnail |
| 661 | 664 | url="<?php echo mvRSSFeed::xmlEncode( $thumb_ref ) ?>" /> |
| Index: trunk/extensions/MetavidWiki/skins/add_media_wizard.js |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | |
| 13 | 13 | var MV_EMBED_VIDEO_HANDLER = true; // if we should use mv_embed for all ogg_hanlder video embeds. |
| 14 | 14 | |
| 15 | | - |
| 16 | 15 | if( MV_EMBED_VIDEO_HANDLER ){ |
| 17 | 16 | var vidIdList = new Array(); |
| 18 | 17 | addOnloadHook( function(){ |
| Index: trunk/extensions/MetavidWiki/skins/mv_stream.js |
| — | — | @@ -169,7 +169,7 @@ |
| 170 | 170 | //check for #autoplay ancor |
| 171 | 171 | var hash = window.location.hash.toString(); |
| 172 | 172 | js_log(" hash is: " + hash); |
| 173 | | - if( hash == '#autoplay'){ |
| | 173 | + if( hash == '#autoplay'){ |
| 174 | 174 | //window.location.hash = ''; |
| 175 | 175 | setTimeout('mv_do_play()', 500); |
| 176 | 176 | } |
| — | — | @@ -904,7 +904,7 @@ |
| 905 | 905 | //check if we are out of range: |
| 906 | 906 | if(mvd_id){ |
| 907 | 907 | var time_ary = $j('#mv_fd_mvd_'+mvd_id).attr('name').split('/'); |
| 908 | | - if( ntp2seconds( time_ary[1] ) < ntp2seconds( $j('#embed_vid').get(0).start_ntp ) ){ |
| | 908 | + if( ntp2seconds( time_ary[1] ) < ntp2seconds( $j('#embed_vid').get(0).start_ntp ) ){ |
| 909 | 909 | window.location = wgArticlePath.replace( '$1', wgPageName +'/'+ time_ary[1] + '/' + time_ary[2]) + '#autoplay'; |
| 910 | 910 | return ; |
| 911 | 911 | } |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js |
| — | — | @@ -17,7 +17,8 @@ |
| 18 | 18 | upload_mode:'autodetect', //can be 'post', 'chunks' or autodetect. (autodetect issues an api call) |
| 19 | 19 | encoder_settings:{ //@@todo allow server to set this |
| 20 | 20 | 'maxSize': 400, |
| 21 | | - 'videoBitrate': 400 |
| | 21 | + 'videoBitrate': 400, |
| | 22 | + 'noUpscaling':true |
| 22 | 23 | }, |
| 23 | 24 | formData:{}, //the form to be submitted |
| 24 | 25 | |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libSequencer/mvPlayList.js |
| — | — | @@ -678,7 +678,7 @@ |
| 679 | 679 | //ads colors/dividers between tracks |
| 680 | 680 | colorPlayHead: function(){ |
| 681 | 681 | if( !this.mv_seeker_width) |
| 682 | | - this.mv_seeker_width = $j('#mv_seeker_slider_'+this.id).width(); |
| | 682 | + this.mv_seeker_width = $j('#mv_seeker_slider_'+this.id).width(); |
| 683 | 683 | |
| 684 | 684 | if( !this.track_len ) |
| 685 | 685 | this.track_len = $j('#seeker_bar_'+this.id).css('width').replace(/px/, ''); |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libClipEdit/mvClipEdit.js |
| — | — | @@ -406,7 +406,7 @@ |
| 407 | 407 | applyInsertControlBindings:function(){ |
| 408 | 408 | var _this = this; |
| 409 | 409 | $j('.mv_insert_image_page').click(function(){ |
| 410 | | - _this.applyEdit(); |
| | 410 | + _this.applyEdit(); |
| 411 | 411 | //copy over the desc text to the resource object |
| 412 | 412 | _this.rObj['inlineDesc']= $j('#mv_inline_img_desc').val(); |
| 413 | 413 | _this.p_rsdObj.insertResource( _this.rObj ); |
| — | — | @@ -470,8 +470,13 @@ |
| 471 | 471 | //if the video is "roe" based select the ogg stream |
| 472 | 472 | if( this.rObj.roe_url && this.rObj.pSobj.cp.stream_import_key){ |
| 473 | 473 | var source = $j('#embed_vid').get(0).media_element.getSourceById( this.rObj.pSobj.cp.stream_import_key ); |
| 474 | | - this.rObj['src'] = source.getURI(); |
| 475 | | - js_log("g src_key: " + this.rObj.pSobj.cp.stream_import_key + ' src:' + this.rObj['src']) ; |
| | 474 | + if(!source){ |
| | 475 | + js_error('Error::could not find source: ' + this.rObj.pSobj.cp.stream_import_key); |
| | 476 | + }else{ |
| | 477 | + this.rObj['src'] = source.getURI(); |
| | 478 | + js_log("g src_key: " + this.rObj.pSobj.cp.stream_import_key + ' src:' + this.rObj['src']) ; |
| | 479 | + return true; |
| | 480 | + } |
| 476 | 481 | } |
| 477 | 482 | }, |
| 478 | 483 | applyCrop:function(){ |
| — | — | @@ -494,6 +499,7 @@ |
| 495 | 500 | '</div>' |
| 496 | 501 | ); |
| 497 | 502 | } |
| | 503 | + return true; |
| 498 | 504 | }, |
| 499 | 505 | //right now enableCrop loads "just in time" |
| 500 | 506 | //@@todo we really need an "auto loader" type system. |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libEmbedObj/mv_nativeEmbed.js |
| — | — | @@ -86,9 +86,9 @@ |
| 87 | 87 | * native callbacks for the video tag: |
| 88 | 88 | */ |
| 89 | 89 | oncanplaythrough : function(){ |
| 90 | | - js_log("f:oncanplaythrough start playback"); |
| | 90 | + //js_log("f:oncanplaythrough start playback"); |
| 91 | 91 | //start playback (we don't yet support pre-loading clips) |
| 92 | | - this.play(); |
| | 92 | + //this.play(); |
| 93 | 93 | }, |
| 94 | 94 | onloadedmetadata: function(){ |
| 95 | 95 | js_log('f:onloadedmetadata get duration: ' +this.vid.duration); |
| Property changes on: trunk/extensions/MetavidWiki/skins/mv_embed |
| ___________________________________________________________________ |
| Name: svn:ignore |
| 96 | 96 | + test.js |