Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296471
Change subject: Follow-up I454380c3: Update/fix some things I missed
......................................................................
Follow-up I454380c3: Update/fix some things I missed
Per Krinkle's comment
Change-Id: I527a694116939d0303a06556eb479201852e227d
---
M CiteDataModule.php
M CiteHooks.php
M modules/ve-cite/ve.ui.MWReference.init.js
3 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite
refs/changes/71/296471/1
diff --git a/CiteDataModule.php b/CiteDataModule.php
index 0e2d9a3..ce74ebf 100644
--- a/CiteDataModule.php
+++ b/CiteDataModule.php
@@ -48,7 +48,7 @@
return
've.init.platform.addMessages(' . FormatJson::encode(
[
-
'visualeditor-cite-tool-definition.json' => json_encode( $citationTools )
+ 'cite-tool-definition.json' =>
json_encode( $citationTools )
],
ResourceLoader::inDebugMode()
) . ');';
diff --git a/CiteHooks.php b/CiteHooks.php
index 00bcc20..b71b28b 100644
--- a/CiteHooks.php
+++ b/CiteHooks.php
@@ -21,7 +21,10 @@
public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
if (
$title->inNamespace( NS_MEDIAWIKI ) &&
- $title->getText() ==
'Visualeditor-cite-tool-definition.json'
+ (
+ $title->getText() ==
'Visualeditor-cite-tool-definition.json' ||
+ $title->getText() == 'Cite-tool-definition.json'
+ )
) {
$model = CONTENT_MODEL_JSON;
}
diff --git a/modules/ve-cite/ve.ui.MWReference.init.js
b/modules/ve-cite/ve.ui.MWReference.init.js
index 85b113e..e2bca2f 100644
--- a/modules/ve-cite/ve.ui.MWReference.init.js
+++ b/modules/ve-cite/ve.ui.MWReference.init.js
@@ -75,12 +75,12 @@
try {
// Must use mw.message to avoid JSON being parsed as
Wikitext
- tools = JSON.parse( mw.message(
'visualeditor-cite-tool-definition.json' ).plain() );
+ tools = JSON.parse( mw.message(
'cite-tool-definition.json' ).plain() );
} catch ( e ) {}
if ( !tools ) {
try {
// Must use mw.message to avoid JSON being
parsed as Wikitext
- tools = JSON.parse( mw.message(
'cite-tool-definition.json' ).plain() );
+ tools = JSON.parse( mw.message(
'visualeditor-cite-tool-definition.json' ).plain() );
} catch ( e ) {}
}
--
To view, visit https://gerrit.wikimedia.org/r/296471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I527a694116939d0303a06556eb479201852e227d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
