Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295936
Change subject: Allows to register a specific target per content model
......................................................................
Allows to register a specific target per content model
Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Task: T138489
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
3 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/36/295936/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 873b5ba..5de173e 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -665,12 +665,12 @@
$thumbLimits = $coreConfig->get( 'ThumbLimits' );
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig(
'visualeditor' );
$availableNamespaces =
ApiVisualEditor::getAvailableNamespaceIds( $veConfig );
- $availableContentModels = array_keys( array_filter(
+ $availableContentModels = array_filter(
array_merge(
ExtensionRegistry::getInstance()->getAttribute(
'VisualEditorAvailableContentModels' ),
$veConfig->get(
'VisualEditorAvailableContentModels' )
)
- ) );
+ );
$vars['wgVisualEditorConfig'] = [
'disableForAnons' => $veConfig->get(
'VisualEditorDisableForAnons' ),
diff --git a/extension.json b/extension.json
index 810cb8c..f766546 100644
--- a/extension.json
+++ b/extension.json
@@ -104,7 +104,7 @@
"_merge_strategy": "array_plus"
},
"VisualEditorAvailableContentModels": {
- "wikitext": true,
+ "wikitext": "article",
"_merge_strategy": "array_plus"
},
"VisualEditorSkinToolbarScrollOffset": [],
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d465750..40996bf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -137,7 +137,9 @@
.then( function () {
var target;
- target =
ve.init.mw.targetFactory.create( 'article' );
+ target =
ve.init.mw.targetFactory.create(
+ conf.contentModels[
mw.config.get( 'wgPageContentModel' ) ]
+ );
target.connect( this, {
transformPage: function () {
if ( onlyTabIsVE ) {
@@ -676,7 +678,7 @@
mw.config.get( 'wgTranslatePageTranslation' ) !== 'translation'
&&
// Only for pages with a supported content model
- conf.contentModels.indexOf( mw.config.get( 'wgPageContentModel'
) ) !== -1
+ conf.contentModels.hasOwnProperty( mw.config.get(
'wgPageContentModel' ) )
);
// FIXME: We should do this more elegantly
--
To view, visit https://gerrit.wikimedia.org/r/295936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
