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

Merge "Server-side replace Edit=>Edit Source on talk NS"

Browse source
This commit is contained in:
jenkins-bot 2015-09-17 01:22:58 +00:00 committed by Gerrit Code Review
parent 867c63e9b2 051066ead6
commit 02897451d2
2 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
VisualEditor.hooks.php
View file

@ -262,12 +262,6 @@ class VisualEditorHooks {
return true;
}
$availableNamespaces = $config->get( 'VisualEditorAvailableNamespaces' );
// Exit if we're not in a VE-enabled namespace
if ( !$title->inNamespaces( array_keys( array_filter( $availableNamespaces ) ) ) ) {
return true;
}
// Exit if we're on a foreign file description page
if (
$title->inNamespace( NS_FILE ) &&
@ -278,13 +272,17 @@ class VisualEditorHooks {
}
$tabMessages = $config->get( 'VisualEditorTabMessages' );
$veEditSection = $tabMessages['editsection'] !== null ?
$tabMessages['editsection'] : 'editsection';
$sourceEditSection = $tabMessages['editsectionsource'] !== null ?
$tabMessages['editsectionsource'] : 'editsection';
$result['editsection']['text'] = $skin->msg( $sourceEditSection )->inLanguage( $lang )->text();
$availableNamespaces = $config->get( 'VisualEditorAvailableNamespaces' );
// add VE edit section in VE available namespaces
if ( $title->inNamespaces( array_keys( array_filter( $availableNamespaces ) ) ) ) {
$veEditSection = $tabMessages['editsection'] !== null ?
$tabMessages['editsection'] : 'editsection';
$veLink = array(
'text' => $skin->msg( $veEditSection )->inLanguage( $lang )->text(),
'targetTitle' => $title,
@ -298,10 +296,11 @@ class VisualEditorHooks {
$result['veeditsection'] = $veLink;
if ( $config->get( 'VisualEditorTabPosition' ) === 'before' ) {
krsort( $result );
// TODO: This will probably cause weird ordering if any other extensions added something already.
// TODO: This will probably cause weird ordering if any other extensions added something
// already.
// ... wfArrayInsertBefore?
}
}
return true;
}

7
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css
View file

@ -33,10 +33,3 @@
margin-left: 0.25em;
color: #555;
}
/* Must have the same, or higher, specificity (4x class/pseudo-class) as the rule above */
.client-js.ve-not-available .mw-content-ltr .mw-editsection-bracket,
.client-js.ve-not-available .mw-content-rtl .mw-editsection-bracket {
margin-left: 0;
margin-right: 0;
}