| Index: branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.php |
| — | — | @@ -62,6 +62,7 @@ |
| 63 | 63 | $wgHooks['GetPreferences'][] = 'WikiEditorHooks::getPreferences'; |
| 64 | 64 | $wgHooks['ResourceLoaderGetConfigVars'][] = 'WikiEditorHooks::resourceLoaderGetConfigVars'; |
| 65 | 65 | $wgHooks['MakeGlobalVariablesScript'][] = 'WikiEditorHooks::makeGlobalVariablesScript'; |
| | 66 | +$wgHooks['EditPageBeforeEditToolbar'][] = 'WikiEditorHooks::EditPageBeforeEditToolbar'; |
| 66 | 67 | |
| 67 | 68 | $wikiEditorTpl = array( |
| 68 | 69 | 'localBasePath' => dirname( __FILE__ ) . '/modules', |
| Index: branches/wmf/1.19wmf1/extensions/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -214,6 +214,21 @@ |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | /** |
| | 218 | + * EditPageBeforeEditToolbar hook |
| | 219 | + * |
| | 220 | + * Disable the old toolbar if the new one is enabled |
| | 221 | + * |
| | 222 | + * @param $toolbar html |
| | 223 | + * @return bool |
| | 224 | + */ |
| | 225 | + public static function EditPageBeforeEditToolbar( &$toolbar ) { |
| | 226 | + if ( self::isEnabled( 'toolbar' ) ) { |
| | 227 | + $toolbar = ''; |
| | 228 | + } |
| | 229 | + return true; |
| | 230 | + } |
| | 231 | + |
| | 232 | + /** |
| 218 | 233 | * GetPreferences hook |
| 219 | 234 | * |
| 220 | 235 | * Adds WikiEditor-releated items to the preferences |
| Index: branches/wmf/1.19wmf1/extensions/Vector/Vector.php |
| — | — | @@ -125,6 +125,7 @@ |
| 126 | 126 | 'jquery.suggestions', |
| 127 | 127 | 'jquery.autoEllipsis', |
| 128 | 128 | 'jquery.placeholder', |
| | 129 | + 'mediawiki.legacy.mwsuggest', // to ensure we disable it in proper order |
| 129 | 130 | ), |
| 130 | 131 | ), |
| 131 | 132 | ); |
| Property changes on: branches/wmf/1.19wmf1/extensions/Vector |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 132 | 133 | Merged /trunk/extensions/Vector:r112153,112160 |
| Index: branches/wmf/1.19wmf1/extensions/UploadWizard/resources/mw.fileApi.js |
| — | — | @@ -32,9 +32,9 @@ |
| 33 | 33 | * @todo is there a way to check this instead of hardcoding browsers and version? |
| 34 | 34 | */ |
| 35 | 35 | isSliceAvailable: function() { |
| 36 | | - return mw.fileApi.isAvailable() && |
| 37 | | - ( ($j.browser.mozilla && $j.browser.version >= '5.0') || |
| 38 | | - ($j.browser.webkit && $j.browser.version >= '534.28') ); |
| | 36 | + return mw.fileApi.isAvailable() && |
| | 37 | + ( ($j.browser.mozilla && parseFloat($j.browser.version) >= 5.0) || |
| | 38 | + ($j.browser.webkit && parseFloat($j.browser.version) >= 534.28) ); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
| Property changes on: branches/wmf/1.19wmf1/extensions/UploadWizard |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 42 | 42 | Merged /trunk/extensions/UploadWizard:r111604,111796,112153,112160 |
| Property changes on: branches/wmf/1.19wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 43 | Merged /trunk/extensions:r111604,111796,112153,112160 |