https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112164
Revision: 112164
Author: reedy
Date: 2012-02-22 23:31:02 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
MFT r111604, r111796, r112153, r112160
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/UploadWizard/resources/mw.fileApi.js
branches/wmf/1.19wmf1/extensions/Vector/Vector.php
branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php
branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/
branches/wmf/1.19wmf1/extensions/UploadWizard/
branches/wmf/1.19wmf1/extensions/Vector/
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111814,111947,112074
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Property changes on: branches/wmf/1.19wmf1/extensions/UploadWizard
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/phase3/extensions/UploadWizard:85939
+ /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/extensions/UploadWizard:111604,111796,112153,112160
/trunk/phase3/extensions/UploadWizard:85939
Modified: branches/wmf/1.19wmf1/extensions/UploadWizard/resources/mw.fileApi.js
===================================================================
--- branches/wmf/1.19wmf1/extensions/UploadWizard/resources/mw.fileApi.js
2012-02-22 23:31:00 UTC (rev 112163)
+++ branches/wmf/1.19wmf1/extensions/UploadWizard/resources/mw.fileApi.js
2012-02-22 23:31:02 UTC (rev 112164)
@@ -32,9 +32,9 @@
* @todo is there a way to check this instead of hardcoding
browsers and version?
*/
isSliceAvailable: function() {
- return mw.fileApi.isAvailable() &&
- ( ($j.browser.mozilla && $j.browser.version
>= '5.0') ||
- ($j.browser.webkit && $j.browser.version
>= '534.28') );
+ return mw.fileApi.isAvailable() &&
+ ( ($j.browser.mozilla &&
parseFloat($j.browser.version) >= 5.0) ||
+ ($j.browser.webkit &&
parseFloat($j.browser.version) >= 534.28) );
}
Property changes on: branches/wmf/1.19wmf1/extensions/Vector
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions/Vector:100352-107913
/branches/REL1_15/phase3/extensions/Vector:51646
/branches/REL1_17/phase3/extensions/Vector:81445,81448
/branches/new-installer/phase3/extensions/Vector:43664-66004
/branches/sqlite/extensions/Vector:58211-58321
/branches/wmf/1.18wmf1/extensions/Vector:97508
/trunk/extensions/Vector:111043,111199,111218,111484,111575,111659-111661,111668,111670,111685
/trunk/phase3/extensions/Vector:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions/Vector:100352-107913
/branches/REL1_15/phase3/extensions/Vector:51646
/branches/REL1_17/phase3/extensions/Vector:81445,81448
/branches/new-installer/phase3/extensions/Vector:43664-66004
/branches/sqlite/extensions/Vector:58211-58321
/branches/wmf/1.18wmf1/extensions/Vector:97508
/trunk/extensions/Vector:111043,111199,111218,111484,111575,111659-111661,111668,111670,111685,112153,112160
/trunk/phase3/extensions/Vector:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified: branches/wmf/1.19wmf1/extensions/Vector/Vector.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/Vector/Vector.php 2012-02-22 23:31:00 UTC
(rev 112163)
+++ branches/wmf/1.19wmf1/extensions/Vector/Vector.php 2012-02-22 23:31:02 UTC
(rev 112164)
@@ -125,6 +125,7 @@
'jquery.suggestions',
'jquery.autoEllipsis',
'jquery.placeholder',
+ 'mediawiki.legacy.mwsuggest', // to ensure we disable
it in proper order
),
),
);
Modified: branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php
2012-02-22 23:31:00 UTC (rev 112163)
+++ branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php
2012-02-22 23:31:02 UTC (rev 112164)
@@ -214,6 +214,21 @@
}
/**
+ * EditPageBeforeEditToolbar hook
+ *
+ * Disable the old toolbar if the new one is enabled
+ *
+ * @param $toolbar html
+ * @return bool
+ */
+ public static function EditPageBeforeEditToolbar( &$toolbar ) {
+ if ( self::isEnabled( 'toolbar' ) ) {
+ $toolbar = '';
+ }
+ return true;
+ }
+
+ /**
* GetPreferences hook
*
* Adds WikiEditor-releated items to the preferences
Modified: branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.php 2012-02-22
23:31:00 UTC (rev 112163)
+++ branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.php 2012-02-22
23:31:02 UTC (rev 112164)
@@ -62,6 +62,7 @@
$wgHooks['GetPreferences'][] = 'WikiEditorHooks::getPreferences';
$wgHooks['ResourceLoaderGetConfigVars'][] =
'WikiEditorHooks::resourceLoaderGetConfigVars';
$wgHooks['MakeGlobalVariablesScript'][] =
'WikiEditorHooks::makeGlobalVariablesScript';
+$wgHooks['EditPageBeforeEditToolbar'][] =
'WikiEditorHooks::EditPageBeforeEditToolbar';
$wikiEditorTpl = array(
'localBasePath' => dirname( __FILE__ ) . '/modules',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
