https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113049
Revision: 113049
Author: reedy
Date: 2012-03-05 17:46:47 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
MFT r112229, r112248, r112253, r112260, r112758
Modified Paths:
--------------
branches/REL1_19/extensions/OggHandler/OggHandler_body.php
branches/REL1_19/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizard.js
branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
branches/REL1_19/extensions/WikiLove/ApiWikiLove.php
Property Changed:
----------------
branches/REL1_19/extensions/
branches/REL1_19/extensions/OggHandler/OggHandler_body.php
branches/REL1_19/extensions/UploadWizard/
Property changes on: branches/REL1_19/extensions
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions:111011,111199,111218,111484,111575,111685,111713,111715,112074,112153,112160,112295,112517,112520,112524,112562,112660,112687,112751,112770-112772,112775,112849,112851,112856,112859,112903,112925,112993
+
/trunk/extensions:111011,111199,111218,111484,111575,111685,111713,111715,112074,112153,112160,112229,112248,112253,112260,112295,112517,112520,112524,112562,112660,112687,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112993
Modified: branches/REL1_19/extensions/OggHandler/OggHandler_body.php
===================================================================
--- branches/REL1_19/extensions/OggHandler/OggHandler_body.php 2012-03-05
17:22:37 UTC (rev 113048)
+++ branches/REL1_19/extensions/OggHandler/OggHandler_body.php 2012-03-05
17:46:47 UTC (rev 113049)
@@ -261,9 +261,9 @@
global $wgOggThumbLocation;
if ( $wgOggThumbLocation !== false ) {
- $status = $this->runOggThumb( $file->getPath(),
$dstPath, $thumbTime );
+ $status = $this->runOggThumb( $file->getLocalRefPath(),
$dstPath, $thumbTime );
} else {
- $status = $this->runFFmpeg( $file->getPath(), $dstPath,
$thumbTime );
+ $status = $this->runFFmpeg( $file->getLocalRefPath(),
$dstPath, $thumbTime );
}
if ( $status === true ) {
return new OggVideoDisplay( $file, $file->getURL(),
$dstUrl, $width, $height,
Property changes on: branches/REL1_19/extensions/OggHandler/OggHandler_body.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf/1.18wmf1/extensions/OggHandler/OggHandler_body.php:98207
/trunk/extensions/OggHandler/OggHandler_body.php:111199
+ /branches/wmf/1.18wmf1/extensions/OggHandler/OggHandler_body.php:98207
/trunk/extensions/OggHandler/OggHandler_body.php:111199,112260,112758
Property changes on: branches/REL1_19/extensions/UploadWizard
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/extensions/UploadWizard:112517,112562
/trunk/phase3/extensions/UploadWizard:85939
+ /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/extensions/UploadWizard:112229,112248,112253,112260,112517,112562,112758
/trunk/phase3/extensions/UploadWizard:85939
Modified:
branches/REL1_19/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
===================================================================
---
branches/REL1_19/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2012-03-05 17:22:37 UTC (rev 113048)
+++
branches/REL1_19/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2012-03-05 17:46:47 UTC (rev 113049)
@@ -73,6 +73,7 @@
$this->addJsVars( $subPage );
// dependencies (css, js)
+ $out->addModuleStyles( 'ext.uploadWizard' );
$out->addModules( 'ext.uploadWizard' );
// where the uploadwizard will go
Modified: branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizard.js
2012-03-05 17:22:37 UTC (rev 113048)
+++ branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizard.js
2012-03-05 17:46:47 UTC (rev 113049)
@@ -51,7 +51,7 @@
// load list of languages so we'll have it ready when
description interfaces are created
// XXX replace this code once any of the following bugs are
fixed: 25845, 27535, 27561
- var languageHandlerUrl = mw.util.wikiScript() + '?' + $.param(
{ 'title': 'MediaWiki:LanguageHandler.js', 'action': 'raw', 'ctype':
'text/javascript' } );
+ var languageHandlerUrl = mw.config.get( 'wgServer' ) +
mw.util.wikiScript() + '?' + $.param( { 'title':
'MediaWiki:LanguageHandler.js', 'action': 'raw', 'ctype': 'text/javascript' } );
mw.loader.load( languageHandlerUrl );
// remove first spinner
@@ -746,6 +746,7 @@
} else {
$j( '#mwe-upwiz-add-file' ).button( 'option',
'disabled', true );
$j( _this.uploadToAdd.ui.div ).hide();
+ _this.uploadToAdd.ui.hideFileInput();
}
Modified:
branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
===================================================================
---
branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
2012-03-05 17:22:37 UTC (rev 113048)
+++
branches/REL1_19/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
2012-03-05 17:46:47 UTC (rev 113049)
@@ -460,28 +460,45 @@
* @param selector jquery-compatible selector, for a single element
*/
moveFileInputToCover: function( selector ) {
- var $covered = $j( selector );
+ var _this = this;
+ var update = function() {
+ var $covered = $j( selector );
- this.fileCtrlContainer
- .css( $covered.position() )
- .css( 'marginTop', $covered.css( 'marginTop' ) )
- .css( 'marginRight', $covered.css( 'marginRight' ) )
- .css( 'marginBottom', $covered.css( 'marginBottom' ) )
- .css( 'marginLeft', $covered.css( 'marginLeft' ) )
- .width( $covered.outerWidth() )
- .height( $covered.outerHeight() );
+ _this.fileCtrlContainer
+ .css( $covered.position() )
+ .css( 'marginTop', $covered.css( 'marginTop' ) )
+ .css( 'marginRight', $covered.css(
'marginRight' ) )
+ .css( 'marginBottom', $covered.css(
'marginBottom' ) )
+ .css( 'marginLeft', $covered.css( 'marginLeft'
) )
+ .width( $covered.outerWidth() )
+ .height( $covered.outerHeight() );
- this.fileCtrlContainer.css( { 'z-index': 1 } );
+ _this.fileCtrlContainer.css( { 'z-index': 1 } );
- // shift the file input over with negative margins,
- // internal to the overflow-containing div, so the div shows
all button
- // and none of the textfield-like input
- this.$fileInputCtrl.css( {
- 'margin-left': '-' + ~~( this.$fileInputCtrl.width() -
$covered.outerWidth() - 10 ) + 'px',
- 'margin-top' : '-' + ~~( this.$fileInputCtrl.height() -
$covered.outerHeight() - 10 ) + 'px'
- } );
+ // shift the file input over with negative margins,
+ // internal to the overflow-containing div, so the div
shows all button
+ // and none of the textfield-like input
+ _this.$fileInputCtrl.css( {
+ 'margin-left': '-' + ~~(
_this.$fileInputCtrl.width() - $covered.outerWidth() - 10 ) + 'px',
+ 'margin-top' : '-' + ~~(
_this.$fileInputCtrl.height() - $covered.outerHeight() - 10 ) + 'px'
+ } );
+ }
+ if (this.moveFileInputInterval) {
+ window.clearInterval(this.moveFileInputInterval);
+ }
+ this.moveFileInputInterval = window.setInterval(function() {
+ update();
+ }, 500);
+ update();
+ },
+ hideFileInput: function() {
+ if (this.moveFileInputInterval) {
+ window.clearInterval(this.moveFileInputInterval);
+ }
+ this.moveFileInputInterval = null;
+ // Should we actually hide it?
},
/**
Modified: branches/REL1_19/extensions/WikiLove/ApiWikiLove.php
===================================================================
--- branches/REL1_19/extensions/WikiLove/ApiWikiLove.php 2012-03-05
17:22:37 UTC (rev 113048)
+++ branches/REL1_19/extensions/WikiLove/ApiWikiLove.php 2012-03-05
17:46:47 UTC (rev 113049)
@@ -20,16 +20,25 @@
}
// not using section => 'new' here, as we like to give our own
edit summary
- $api = new ApiMain( new FauxRequest( array(
- 'action' => 'edit',
- 'title' => $talk->getFullText(),
- // need to do this, as Article::replaceSection fails
for non-existing pages
- 'appendtext' => ( $talk->exists() ? "\n\n" : '' ) .
wfMsgForContent( 'newsectionheaderdefaultlevel', $params['subject'] )
- . "\n\n" . $params['text'],
- 'token' => $params['token'],
- 'summary' => wfMsgForContent( 'wikilove-summary',
$wgParser->stripSectionName( $params['subject'] ) ),
- 'notminor' => true,
- ), false, array( 'wsEditToken' => $wgRequest->getSessionData(
'wsEditToken' ) ) ), true );
+ $api = new ApiMain(
+ new DerivativeRequest(
+ $wgRequest,
+ array(
+ 'action' => 'edit',
+ 'title' => $talk->getFullText(),
+ // need to do this, as
Article::replaceSection fails for non-existing pages
+ 'appendtext' => ( $talk->exists() ?
"\n\n" : '' ) .
+ wfMsgForContent(
'newsectionheaderdefaultlevel', $params['subject'] )
+ . "\n\n" . $params['text'],
+ 'token' => $params['token'],
+ 'summary' => wfMsgForContent(
'wikilove-summary',
+ $wgParser->stripSectionName(
$params['subject'] ) ),
+ 'notminor' => true
+ ),
+ false // was posted?
+ ),
+ true // enable write?
+ );
$api->execute();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
