Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296472
Change subject: Follow-up I454380c3: Handle rename of Cite extension's messages
......................................................................
Follow-up I454380c3: Handle rename of Cite extension's messages
Change-Id: I349d7a0bb354a61e9ea19e0d8e53345223f0cdd3
---
M modules/ve.ui.CiteFromIdInspector.js
M modules/ve.ui.CiteSourceSelectWidget.js
2 files changed, 20 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/72/296472/1
diff --git a/modules/ve.ui.CiteFromIdInspector.js
b/modules/ve.ui.CiteFromIdInspector.js
index 45eac93..7c81342 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -92,11 +92,19 @@
// Get the available tools for their titles and icons
try {
// Must use mw.message to avoid JSON being parsed as Wikitext
- this.citeTools = JSON.parse( mw.message(
'visualeditor-cite-tool-definition.json' ).plain() );
- // Limit the number of tools
- this.citeTools.splice( limit );
+ this.citeTools = JSON.parse( mw.message(
'cite-tool-definition.json' ).plain() );
} catch ( e ) { }
+ if ( !this.citeTools ) {
+ try {
+ // Must use mw.message to avoid JSON being parsed as
Wikitext
+ this.citeTools = JSON.parse( mw.message(
'visualeditor-cite-tool-definition.json' ).plain() );
+ } catch ( e ) { }
+ }
+
+ // Limit the number of tools
+ this.citeTools.splice( limit );
+
// API for citoid service
this.service = new mw.Api( {
ajax: {
diff --git a/modules/ve.ui.CiteSourceSelectWidget.js
b/modules/ve.ui.CiteSourceSelectWidget.js
index 7dcd6da..bee6d4c 100644
--- a/modules/ve.ui.CiteSourceSelectWidget.js
+++ b/modules/ve.ui.CiteSourceSelectWidget.js
@@ -27,10 +27,18 @@
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 ) {
tools = [];
}
+ if ( !tools ) {
+ try {
+ // Must use mw.message to avoid JSON being parsed as
Wikitext
+ tools = JSON.parse( mw.message(
'visualeditor-cite-tool-definition.json' ).plain() );
+ } catch ( e ) {
+ tools = [];
+ }
+ }
// Go over available tools
for ( i = 0, len = Math.min( limit, tools.length ); i < len; i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/296472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I349d7a0bb354a61e9ea19e0d8e53345223f0cdd3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
