wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes I9ca43005,I68f9258f

Browse source 
* changes:
  ve.init.mw.ViewPageTarget.init: Pass default values
  VisualEditor.hooks: Sort keys
This commit is contained in:
jenkins-bot 2013-07-31 22:06:38 +00:00 committed by Gerrit Code Review
parent cbf46c0f5c 5036099906
commit dd3d41841d
2 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
VisualEditor.hooks.php
View file

@ -125,12 +125,12 @@ class VisualEditorHooks {
global $wgStylePath, $wgContLang;
$vars['wgVisualEditor'] = array(
'isPageWatched' => $out->getUser()->isWatched( $out->getTitle() ),
'pageLanguageCode' => $out->getTitle()->getPageLanguage()->getHtmlCode(),
'pageLanguageDir' => $out->getTitle()->getPageLanguage()->getDir(),
// Same as in Linker.php
'magnifyClipIconURL' => $wgStylePath .
'/common/images/magnify-clip' .
( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png'
( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png',
'pageLanguageCode' => $out->getTitle()->getPageLanguage()->getHtmlCode(),
'pageLanguageDir' => $out->getTitle()->getPageLanguage()->getDir(),
);
return true;
@ -140,18 +140,26 @@ class VisualEditorHooks {
* Adds extra variables to the global config
*/
public static function onResourceLoaderGetConfigVars( array &$vars ) {
global $wgVisualEditorEnableEventLogging, $wgVisualEditorPluginModules,
$wgVisualEditorEnableExperimentalCode, $wgVisualEditorTabLayout,
$wgVisualEditorDisableForAnons, $wgVisualEditorNamespaces;
global $wgDefaultUserOptions,
$wgVisualEditorDisableForAnons,
$wgVisualEditorEnableEventLogging,
$wgVisualEditorEnableExperimentalCode,
$wgVisualEditorNamespaces,
$wgVisualEditorPluginModules,
$wgVisualEditorTabLayout;
$vars['wgVisualEditorConfig'] = array(
'enableExperimentalCode' => $wgVisualEditorEnableExperimentalCode,
'enableEventLogging' => $wgVisualEditorEnableEventLogging,
'tabLayout' => $wgVisualEditorTabLayout,
'disableForAnons' => $wgVisualEditorDisableForAnons,
'enableEventLogging' => $wgVisualEditorEnableEventLogging,
'enableExperimentalCode' => $wgVisualEditorEnableExperimentalCode,
'namespaces' => $wgVisualEditorNamespaces,
'skins' => self::$supportedSkins,
'pluginModules' => $wgVisualEditorPluginModules,
'defaultUserOptions' => array(
'enable' => $wgDefaultUserOptions['visualeditor-enable'],
'betatempdisable' => $wgDefaultUserOptions['visualeditor-betatempdisable'],
),
'skins' => self::$supportedSkins,
'tabLayout' => $wgVisualEditorTabLayout,
);
return true;

19
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
View file

@ -62,7 +62,7 @@
);
support = {
es5: (
es5: !!(
// It would be much easier to do a quick inline function that asserts "use strict"
// works, but since IE9 doesn't support strict mode (and we don't use strict mode) we
// have to instead list all the ES5 features we do use.
@ -376,10 +376,21 @@
!mw.config.get( 'wgIsRedirect', !!uri.query.redirect ) &&
// User has 'visualeditor-enable' preference enabled (for alpha opt-in)
mw.user.options.get( 'visualeditor-enable' ) &&
// User has 'visualeditor-betatempdisable' preference disabled
!mw.user.options.get( 'visualeditor-betatempdisable' ) &&
// Because user.options is embedded in the HTML and cached per-page for anons on wikis
// with static caching (e.g. wgUseFileCache or reverse-proxy) ignore user.options for
// anons as it is likely outdated.
(
mw.user.isAnon() ?
( conf.defaultUserOptions.enable && !conf.defaultUserOptions.betatempdisable ) :
(
mw.user.options.get( 'visualeditor-enable', conf.defaultUserOptions.enable ) &&
!mw.user.options.get(
'visualeditor-betatempdisable',
conf.defaultUserOptions.betatempdisable
)
)
) &&
// Only in supported skins
$.inArray( mw.config.get( 'skin' ), conf.skins ) !== -1 &&