| Index: branches/js2-work/phase3/js/mwEmbed/skins/mvpcf/styles.css |
| — | — | @@ -459,9 +459,7 @@ |
| 460 | 460 | |
| 461 | 461 | .ui-dialog .ui-dialog-buttonpane button { float: left !important; } |
| 462 | 462 | |
| 463 | | -.ui-widget-content a { text-decoration: underline; } |
| 464 | 463 | |
| 465 | | - |
| 466 | 464 | .vol_container{ |
| 467 | 465 | z-index:99; |
| 468 | 466 | width:23px; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/TimedText/mw.TimedText.js |
| — | — | @@ -416,8 +416,7 @@ |
| 417 | 417 | * get the add text menu item: |
| 418 | 418 | */ |
| 419 | 419 | getLiAddText: function(){ |
| 420 | | - var _this = this; |
| 421 | | - return ''; |
| | 420 | + var _this = this; |
| 422 | 421 | return _this.getLi( gM( 'mwe-add-timed-text'), 'script', function(){ |
| 423 | 422 | _this.showTimedTextEditUI( 'add' ); |
| 424 | 423 | } ) |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/jquery.simpleUploadForm.js |
| — | — | @@ -138,24 +138,26 @@ |
| 139 | 139 | |
| 140 | 140 | // Set up the binding per the config |
| 141 | 141 | if ( options.enable_fogg ) { |
| 142 | | - $j( "#wpUploadFile" ).firefogg( { |
| 143 | | - // An api url (we won't submit directly to action of the form) |
| 144 | | - 'api_url' : options.api_target, |
| 145 | | - |
| 146 | | - // If we should do a form rewrite |
| 147 | | - 'form_rewrite': true, |
| 148 | | - |
| 149 | | - // MediaWiki API supports chunk uploads: |
| 150 | | - 'enable_chunks' : true, |
| 151 | | - |
| 152 | | - 'edit_form_selector' : '#suf-upload', |
| 153 | | - 'new_source_cb' : function( orgFilename, oggName ) { |
| 154 | | - $j( "#wpDestFile" ).val( oggName ).doDestCheck( { |
| 155 | | - warn_target: "#wpDestFile-warning" |
| 156 | | - } ); |
| 157 | | - }, |
| 158 | | - 'done_upload_cb' : options.ondone_callback |
| 159 | | - } ); |
| | 142 | + mw.load( 'AddMedia.firefogg', function(){ |
| | 143 | + $j( "#wpUploadFile" ).firefogg( { |
| | 144 | + // An api url (we won't submit directly to action of the form) |
| | 145 | + 'api_url' : options.api_target, |
| | 146 | + |
| | 147 | + // If we should do a form rewrite |
| | 148 | + 'form_rewrite': true, |
| | 149 | + |
| | 150 | + // MediaWiki API supports chunk uploads: |
| | 151 | + 'enable_chunks' : true, |
| | 152 | + |
| | 153 | + 'edit_form_selector' : '#suf-upload', |
| | 154 | + 'new_source_cb' : function( orgFilename, oggName ) { |
| | 155 | + $j( "#wpDestFile" ).val( oggName ).doDestCheck( { |
| | 156 | + warn_target: "#wpDestFile-warning" |
| | 157 | + } ); |
| | 158 | + }, |
| | 159 | + 'done_upload_cb' : options.ondone_callback |
| | 160 | + } ); |
| | 161 | + }); |
| 160 | 162 | } |
| 161 | 163 | } ); |
| 162 | 164 | } |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -405,7 +405,7 @@ |
| 406 | 406 | case 'playlist': |
| 407 | 407 | // Make sure we have the necessary playlist libs loaded: |
| 408 | 408 | mw.load( [ |
| 409 | | - 'mvPlayList' |
| | 409 | + 'mw.PlayList' |
| 410 | 410 | ], function() { |
| 411 | 411 | |
| 412 | 412 | // Create playlist player interface |
| — | — | @@ -424,8 +424,8 @@ |
| 425 | 425 | '</div>' |
| 426 | 426 | ); |
| 427 | 427 | |
| 428 | | - // Issue the checkPlayerSources call to the new playlist interface: |
| 429 | | - $j( '#' + element_id ).get(0).showPlayer(); |
| | 428 | + // Issue the checkPlayerSources call to the new playlist interface: |
| | 429 | + $j( '#' + playlistPlayer.id ).get(0).showPlayer(); |
| 430 | 430 | } ); |
| 431 | 431 | break; |
| 432 | 432 | } |
| — | — | @@ -1186,7 +1186,7 @@ |
| 1187 | 1187 | // Percent of the clip buffered: |
| 1188 | 1188 | 'bufferedPercent' : 0, |
| 1189 | 1189 | |
| 1190 | | - // Holds the timmer interval function |
| | 1190 | + // Holds the timer interval function |
| 1191 | 1191 | 'monitorTimerId' : null, |
| 1192 | 1192 | |
| 1193 | 1193 | /** |
| — | — | @@ -1352,8 +1352,9 @@ |
| 1353 | 1353 | }, |
| 1354 | 1354 | |
| 1355 | 1355 | /** |
| 1356 | | - * Check player sources if we need to get media sources |
| 1357 | | - * form an external file that request is issued here |
| | 1356 | + * Check player for sources. |
| | 1357 | + * If we need to get media sources form an external file |
| | 1358 | + * that request is issued here |
| 1358 | 1359 | */ |
| 1359 | 1360 | checkPlayerSources: function() { |
| 1360 | 1361 | mw.log( 'f:checkPlayerSources' ); |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/htmlEmbed.js |
| — | — | @@ -103,7 +103,6 @@ |
| 104 | 104 | var ct = new Date(); |
| 105 | 105 | this.currentTime = ( ( ct.getTime() - this.clockStartTime ) / 1000 ) + this.pauseTime; |
| 106 | 106 | var ct = new Date(); |
| 107 | | - // mw.log('mvPlayList:monitor trueTime: '+ this.currentTime); |
| 108 | 107 | |
| 109 | 108 | // Once currentTime is updated call parent_monitor |
| 110 | 109 | this.parent_monitor(); |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/Sequencer/loader.js |
| — | — | @@ -13,8 +13,7 @@ |
| 14 | 14 | mw.getStyleSheet( mw.getMwEmbedPath() + 'skins/' + mw.getConfig( 'skinName' ) + '/mv_sequence.css' ); |
| 15 | 15 | // Make sure we have the required mwEmbed libs: |
| 16 | 16 | mw.load( [ |
| 17 | | - [ // Load the EmbedPlayer Module ( includes lots of dependent classes ) |
| 18 | | - // ( we can't predictavly script-load it ) |
| | 17 | + [ // Load the EmbedPlayer Module ( includes lots of dependent classes ) |
| 19 | 18 | 'EmbedPlayer' |
| 20 | 19 | ], |
| 21 | 20 | [ |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/Sequencer/mw.SeqRemoteSearchDriver.js |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | // Inherit the remoteSearchDriver properties:n |
| 31 | | - var tmpRemoteSearchDriver = new remoteSearchDriver( options ); |
| | 31 | + var tmpRemoteSearchDriver = new mw.RemoteSearchDriver( options ); |
| 32 | 32 | for ( var i in tmpRemoteSearchDriver ) { |
| 33 | 33 | if ( this[i] ) { |
| 34 | 34 | this['parent_' + i] = tmpRemoteSearchDriver[i]; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/Sequencer/mw.Sequencer.js |
| — | — | @@ -79,7 +79,9 @@ |
| 80 | 80 | |
| 81 | 81 | instance_name:'mvSeq', // for now only one instance by name mvSeq is allowed |
| 82 | 82 | |
| 83 | | - target_sequence_container:null,// text value (so that its a valid property) |
| | 83 | + // Target sequence container |
| | 84 | + target_sequence_container:null, |
| | 85 | + |
| 84 | 86 | target_form_text: null, |
| 85 | 87 | |
| 86 | 88 | // what is our save mode: |
| — | — | @@ -176,10 +178,10 @@ |
| 177 | 179 | 'js':function( this_seq ) { |
| 178 | 180 | // Load the search interface with sequence tool targets |
| 179 | 181 | mw.load( [ |
| 180 | | - 'remoteSearchDriver', |
| 181 | | - 'seqRemoteSearchDriver' |
| | 182 | + 'mw.RemoteSearchDriver', |
| | 183 | + 'mw.SeqRemoteSearchDriver' |
| 182 | 184 | ], function() { |
| 183 | | - this_seq.mySearch = new seqRemoteSearchDriver( this_seq ); |
| | 185 | + this_seq.mySearch = new mw.SeqRemoteSearchDriver( this_seq ); |
| 184 | 186 | this_seq.mySearch.createUI(); |
| 185 | 187 | } ); |
| 186 | 188 | } |
| — | — | @@ -216,7 +218,7 @@ |
| 217 | 219 | key_ctrl_down:false, |
| 218 | 220 | inputFocus:false, |
| 219 | 221 | |
| 220 | | - init:function( iObj ) { |
| | 222 | + init: function( iObj ) { |
| 221 | 223 | // set up pointer to _this for current scope: |
| 222 | 224 | var _this = this; |
| 223 | 225 | // set the default values: |
| — | — | @@ -485,16 +487,21 @@ |
| 486 | 488 | } |
| 487 | 489 | } |
| 488 | 490 | }, |
| 489 | | - // once playlist is ready continue |
| | 491 | + // Once playlist is ready continue |
| 490 | 492 | checkReadyPlObj: function() { |
| | 493 | + var _this = this; |
| 491 | 494 | // set up pointers from sequencer to pl obj |
| 492 | 495 | this.plObj = $j( '#' + this.plObj_id ).get( 0 ); |
| | 496 | + |
| 493 | 497 | // & from seq obj to sequencer |
| 494 | 498 | this.plObj.pSeq = this; |
| 495 | 499 | |
| 496 | | - if ( this.plObj ) |
| 497 | | - if ( ! this.plObj.loading ) |
| | 500 | + if ( this.plObj ){ |
| | 501 | + if ( ! this.plObj.loading ){ |
| 498 | 502 | this.plReadyInit(); |
| | 503 | + return ; |
| | 504 | + } |
| | 505 | + } |
| 499 | 506 | |
| 500 | 507 | // else keep checking for the playlist to be ready |
| 501 | 508 | if ( this.plObj.loading ) { |
| — | — | @@ -502,7 +509,9 @@ |
| 503 | 510 | mw.log( 'error playlist never ready' ); |
| 504 | 511 | } else { |
| 505 | 512 | this.plReadyTimeout++; |
| 506 | | - setTimeout( this.instance_name + '.checkReadyPlObj()', 25 ); |
| | 513 | + setTimeout( function(){ |
| | 514 | + _this.checkReadyPlObj(); |
| | 515 | + }, 25 ); |
| 507 | 516 | } |
| 508 | 517 | } |
| 509 | 518 | }, |
| — | — | @@ -513,10 +522,11 @@ |
| 514 | 523 | var _this = this; |
| 515 | 524 | mw.log( 'plReadyInit' ); |
| 516 | 525 | mw.log( this.plObj ); |
| 517 | | - // give the playlist a pointer to its parent seq: |
| | 526 | + |
| | 527 | + // Give the playlist a pointer to its parent seq: |
| 518 | 528 | this.plObj['seqObj'] = this; |
| 519 | 529 | |
| 520 | | - // update playlist (if its empty right now) |
| | 530 | + // Update playlist (if its empty right now) |
| 521 | 531 | if ( this.plObj.getClipCount() == 0 ) { |
| 522 | 532 | $j( '#' + this.plObj_id ).html( 'empty playlist' ); |
| 523 | 533 | } |
| — | — | @@ -800,7 +810,7 @@ |
| 801 | 811 | mw.loading_spinner( '#transitions_ic' ); |
| 802 | 812 | mw.load( [ |
| 803 | 813 | '$j.fn.ColorPicker', |
| 804 | | - 'mvTimedEffectsEdit' |
| | 814 | + 'mw.TimedEffectsEdit' |
| 805 | 815 | ], function() { |
| 806 | 816 | // For some reason we lose scope in the options passed to mvTimedEffectsEdit |
| 807 | 817 | // so we re refrence the sequence here: |
| — | — | @@ -823,7 +833,7 @@ |
| 824 | 834 | |
| 825 | 835 | // Load the clipEdit library if not already loaded: |
| 826 | 836 | mw.load( [ |
| 827 | | - 'mvClipEdit' |
| | 837 | + 'mw.ClipEdit' |
| 828 | 838 | ], function() { |
| 829 | 839 | // Zero out the current editor: |
| 830 | 840 | _this.myClipEditor = { }; |
| — | — | @@ -1608,13 +1618,13 @@ |
| 1609 | 1619 | } |
| 1610 | 1620 | |
| 1611 | 1621 | } |
| 1612 | | -/* extension to mvPlayList to support sequencer features properties */ |
| 1613 | | -var mvSeqPlayList = function( element ) { |
| | 1622 | +/* extension to mw.PlayList to support sequencer features properties */ |
| | 1623 | +mw.SeqPlayList = function( element ) { |
| 1614 | 1624 | return this.init( element ); |
| 1615 | 1625 | } |
| 1616 | | -mvSeqPlayList.prototype = { |
| | 1626 | +mw.SeqPlayList.prototype = { |
| 1617 | 1627 | init:function( element ) { |
| 1618 | | - var myPlObj = new mvPlayList( element ); |
| | 1628 | + var myPlObj = new mw.PlayList( element ); |
| 1619 | 1629 | |
| 1620 | 1630 | // inherit mvClip |
| 1621 | 1631 | for ( var method in myPlObj ) { |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/Sequencer/mw.PlayList.js |
| — | — | @@ -179,7 +179,9 @@ |
| 180 | 180 | } |
| 181 | 181 | this.cur_clip.embed.showShare( embed_code ); |
| 182 | 182 | }, |
| 183 | | - |
| | 183 | + isTimedTextSupported: function(){ |
| | 184 | + return false; |
| | 185 | + }, |
| 184 | 186 | checkForTextSource: function() { |
| 185 | 187 | return false; |
| 186 | 188 | }, |
| — | — | @@ -1296,7 +1298,7 @@ |
| 1297 | 1299 | ve.setAttribute( i, vid_init[i] ); |
| 1298 | 1300 | } |
| 1299 | 1301 | } |
| 1300 | | - var videoInterface = new embedPlayer( ve ); |
| | 1302 | + var videoInterface = new mw.EmbedPlayer( ve ); |
| 1301 | 1303 | // inherit the videoInterface |
| 1302 | 1304 | for ( method in videoInterface ) { |
| 1303 | 1305 | if ( method != 'style' ) { |
| — | — | @@ -2008,8 +2010,8 @@ |
| 2009 | 2011 | if ( clipObj ) { |
| 2010 | 2012 | // set up embed: |
| 2011 | 2013 | clipObj.setUpEmbedObj(); |
| 2012 | | - // inhreit embedObject (only called on "new media" |
| 2013 | | - clipObj.embed.sourcesReadyInit(); |
| | 2014 | + // Check for player sources: |
| | 2015 | + clipObj.embed.checkPlayerSources(); |
| 2014 | 2016 | // add clip to track: |
| 2015 | 2017 | this.addCliptoTrack( clipObj , order ); |
| 2016 | 2018 | |
| Index: branches/js2-work/phase3/js/editPage.js |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | 'default_query': wgTitle, |
| 17 | 17 | 'target_title': wgPageName, |
| 18 | 18 | // Here we can setup the content provider overrides |
| 19 | | - 'enabled_providers':['wiki_commons'], |
| | 19 | + 'enabled_providers':['upload'], |
| 20 | 20 | // The local wiki API URL: |
| 21 | 21 | 'local_wiki_api_url': wgServer + wgScriptPath + '/api.php' |
| 22 | 22 | }; |