| Index: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js |
| — | — | @@ -102,6 +102,7 @@ |
| 103 | 103 | } ); |
| 104 | 104 | }); |
| 105 | 105 | }, |
| | 106 | + |
| 106 | 107 | /** |
| 107 | 108 | * Issue a seeking request. |
| 108 | 109 | * |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js |
| — | — | @@ -972,6 +972,7 @@ |
| 973 | 973 | // Show the big play button: |
| 974 | 974 | embedPlayer.$interface.find( '.play-btn-large' ).fadeIn( 'slow' ); |
| 975 | 975 | |
| | 976 | + |
| 976 | 977 | $j(embedPlayer).trigger( 'closeMenuOverlay' ); |
| 977 | 978 | |
| 978 | 979 | return false; // onclick action return false |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js |
| — | — | @@ -7,6 +7,7 @@ |
| 8 | 8 | /* |
| 9 | 9 | * Setup the sequencer jQuery binding: |
| 10 | 10 | */ |
| | 11 | + |
| 11 | 12 | ( function( $ ) { |
| 12 | 13 | $.fn.sequencer = function( options ) { |
| 13 | 14 | // Debugger |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js |
| — | — | @@ -283,7 +283,7 @@ |
| 284 | 284 | updateSequenceFileDescription: function( callback ){ |
| 285 | 285 | var _this = this; |
| 286 | 286 | mw.getToken( _this.getApiUrl(), 'File:' + _this.getVideoFileName(), function( token ){ |
| 287 | | - var pageText = '' |
| | 287 | + var pageText = ''; |
| 288 | 288 | // Check if we should use commons asset description template: |
| 289 | 289 | if( mw.parseUri( _this.getApiUrl() ).host == 'commons.wikimedia.org' ){ |
| 290 | 290 | pageText = _this.getCommonsDescriptionText() |
| — | — | @@ -301,26 +301,27 @@ |
| 302 | 302 | if( data && data.edit && data.edit.result == "Success"){ |
| 303 | 303 | callback( true ); |
| 304 | 304 | } else { |
| 305 | | - callback( false ) |
| | 305 | + callback( false ); |
| 306 | 306 | } |
| 307 | 307 | }); |
| 308 | 308 | }) |
| 309 | 309 | }, |
| | 310 | + |
| 310 | 311 | getBaseFileDescription: function(){ |
| 311 | 312 | var _this = this; |
| 312 | 313 | return 'Published sequence for [['+ _this.getTitleKey() + ']]'; |
| 313 | 314 | }, |
| | 315 | + |
| 314 | 316 | getCommonsDescriptionText: function(){ |
| 315 | 317 | var _this = this; |
| 316 | 318 | |
| 317 | 319 | var descText = '<!-- ' + |
| 318 | 320 | "Note: this is an automated file description for a published video sequence. \n" |
| 319 | 321 | "Changes to this wikitext will be overwiten. Please add metadata and categories to\n" + |
| 320 | | - _this.getTitleKey() + " instead --> \n"; |
| 321 | | - |
| 322 | | - descText += "{{Information\n" + |
| 323 | | - "|Description=" + _this.getBaseFileDescription() + "\n" + |
| 324 | | - "|Source= Sequence Sources assets include:\n"; |
| | 322 | + _this.getTitleKey() + " instead --> \n" + |
| | 323 | + "{{Information\n" + |
| | 324 | + "|Description=" + _this.getBaseFileDescription() + "\n" + |
| | 325 | + "|Source= Sequence Sources assets include:\n"; |
| 325 | 326 | |
| 326 | 327 | // loop over every asset: |
| 327 | 328 | this.sequencer.getSmil().getBody().getRefElementsRecurse(null, 0, function( $node ){ |
| — | — | @@ -346,6 +347,7 @@ |
| 347 | 348 | |
| 348 | 349 | // Add Published Sequence category ( for now ) |
| 349 | 350 | descText += "\n[[Category:Published Sequence]]\n"; |
| | 351 | + |
| 350 | 352 | return descText; |
| 351 | 353 | }, |
| 352 | 354 | |
| — | — | @@ -376,7 +378,7 @@ |
| 377 | 379 | */ |
| 378 | 380 | getSequenceEditUrl: function( titleKey ){ |
| 379 | 381 | var viewUrl = this.getSequenceViewUrl( titleKey ); |
| 380 | | - return mw.replaceUrlParams(viewUrl, {'action':'edit'}) |
| | 382 | + return mw.replaceUrlParams(viewUrl, {'action':'edit'}); |
| 381 | 383 | }, |
| 382 | 384 | |
| 383 | 385 | /** |
| — | — | @@ -392,7 +394,7 @@ |
| 393 | 395 | var _this = this; |
| 394 | 396 | mw.getToken( this.getApiUrl(), 'File:' + this.getVideoFileName(), function( saveToken ){ |
| 395 | 397 | // xxx Get the latest save comment |
| 396 | | - _this.getSaveSummary(function( saveSummary ){ |
| | 398 | + _this.getSaveSummary( function( saveSummary ){ |
| 397 | 399 | var request = { |
| 398 | 400 | 'token' : saveToken, |
| 399 | 401 | 'action' : 'upload', |
| — | — | @@ -410,7 +412,7 @@ |
| 411 | 413 | sequencePublishUploadDone: function(){ |
| 412 | 414 | this.sequencePublished = true; |
| 413 | 415 | } |
| 414 | | - } |
| | 416 | + }; |
| 415 | 417 | |
| 416 | 418 | |
| 417 | 419 | } )( window.mw ); |
| \ No newline at end of file |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js |
| — | — | @@ -316,7 +316,7 @@ |
| 317 | 317 | .css( {'cursor': 'pointer', 'font-size':'x-small' }) |
| 318 | 318 | ); |
| 319 | 319 | // load the sequence editor with the sequencerContainer target |
| 320 | | - mw.load( 'Sequencer', function(){ |
| | 320 | + mw.load( 'Sequencer', function(){ |
| 321 | 321 | $j('#sequencerContainer').sequencer( _this.getSequencerConfig() ); |
| 322 | 322 | }); |
| 323 | 323 | }, |
| — | — | @@ -496,7 +496,7 @@ |
| 497 | 497 | .css( {'width':'200px', 'margin':'auto'}) |
| 498 | 498 | ) |
| 499 | 499 | ) |
| 500 | | - mw.load( 'Sequencer', function(){ |
| | 500 | + mw.load( 'Sequencer', function(){ |
| 501 | 501 | // Send a jquery ui style destroy command ( in case the editor is re-invoked ) |
| 502 | 502 | $j('#edit_sequence_container').sequencer( 'destroy'); |
| 503 | 503 | $j('#edit_sequence_container').sequencer( _this.getSequencerConfig() ); |
| — | — | @@ -544,21 +544,6 @@ |
| 545 | 545 | return mw.absoluteUrl( wgScript.replace('index.php', 'api.php') ); |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | | - // Check page type |
| | 548 | +}; |
| 549 | 549 | |
| 550 | | - // "view" page |
| 551 | | - |
| 552 | | - // set page content to "loading" |
| 553 | | - // get wikitext of page via api |
| 554 | | - // grab xml |
| 555 | | - // update page with sequence and |
| 556 | | - |
| 557 | | - |
| 558 | | - //"edit" page |
| 559 | | - // grab textbox text, |
| 560 | | - // set page to loading |
| 561 | | - // display sequence editor in "body" with -> full-screen link |
| 562 | | -}; //Setup the remote configuration |
| 563 | | - |
| 564 | | - |
| 565 | 550 | } )( window.mw ); |
| \ No newline at end of file |
| Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r144'; |
| | 8 | +var mwRemoteVersion = 'r145'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version makes it easy to debug cache issues |
| — | — | @@ -35,8 +35,9 @@ |
| 36 | 36 | mwUseScriptLoader = false; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | | -//mwReqParam['debug'] =false; |
| | 39 | +//mwReqParam['debug'] = false; |
| 40 | 40 | //mwUseScriptLoader = true; |
| | 41 | +//mwRemoteVersion = Math.random(); |
| 41 | 42 | |
| 42 | 43 | // Setup up some globals to wrap mwEmbed mw.ready and mw.setConfig functions |
| 43 | 44 | |