wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Allow skin developers to set an offset for toolbar floating"

Browse source
This commit is contained in:
jenkins-bot 2015-07-28 20:01:57 +00:00 committed by Gerrit Code Review
parent d319217d34 4981a8253d
commit 12d22fe48a
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
VisualEditor.hooks.php
View file

@ -57,6 +57,15 @@ class VisualEditorHooks {
'ext.visualEditor.targetLoader'
) );
$output->addModuleStyles( array( 'ext.visualEditor.viewPageTarget.noscript' ) );
// add scroll offset js variable to output
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'visualeditor' );
$skinsToolbarScrollOffset = $veConfig->get( 'VisualEditorSkinToolbarScrollOffset' );
$toolbarScrollOffset = 0;
$skinName = $skin->getSkinName();
if ( isset( $skinsToolbarScrollOffset[$skinName] ) ) {
$toolbarScrollOffset = $skinsToolbarScrollOffset[$skinName];
}
$output->addJsConfigVars( 'wgVisualEditorToolbarScrollOffset', $toolbarScrollOffset );
return true;
}

1
extension.json
View file

@ -98,6 +98,7 @@
"VisualEditorEnableTocWidget": false,
"VisualEditorAutoAccountEnable": false,
"VisualEditorAvailableNamespaces": { "2": true },
"VisualEditorSkinToolbarScrollOffset": [],
"VisualEditorParsoidTimeout": 100
},
"APIModules": {

7
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -20,7 +20,12 @@
*/
ve.init.mw.Target = function VeInitMwTarget( pageName, revisionId ) {
// Parent constructor
ve.init.Target.call( this, { shadow: true, actions: true, floatable: true } );
ve.init.Target.call( this, {
shadow: true,
actions: true,
floatable: true,
scrollOffset: mw.config.get( 'wgVisualEditorToolbarScrollOffset', 0 )
} );
// Properties
this.pageName = pageName;