Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/293746
Change subject: Make visualeditor-quick-access-characters.json always exist
......................................................................
Make visualeditor-quick-access-characters.json always exist
Bug: T137368
Change-Id: I3f0f88495323b74d156c24939ca12840b4b970c5
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/init/ve.init.mw.Platform.js
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/46/293746/1
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 32b847f..9cfd3f0 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -287,6 +287,7 @@
"visualeditor-preference-tabs-prefer-ve": "Always give me the visual
editor if possible",
"visualeditor-preference-tabs-prefer-wt": "Always give me the source
editor",
"visualeditor-preference-tabs-remember-last": "Remember my last editor",
+ "visualeditor-quick-access-characters.json": "null",
"visualeditor-recreate": "The page has been deleted since you started
editing. Press \"$1\" to recreate it.",
"visualeditor-redirect-description": "Redirect to $1",
"visualeditor-savedialog-error-badtoken": "We could not save your edit
because the session was no longer valid.",
diff --git a/modules/ve-mw/init/ve.init.mw.Platform.js
b/modules/ve-mw/init/ve.init.mw.Platform.js
index d589ebf..333d246 100644
--- a/modules/ve-mw/init/ve.init.mw.Platform.js
+++ b/modules/ve-mw/init/ve.init.mw.Platform.js
@@ -188,13 +188,14 @@
otherMsg = mw.msg(
'visualeditor-quick-access-characters.json' ),
groupObject;
- if ( otherMsg !== '<visualeditor-quick-access-characters.json>'
) {
- try {
- characters[ otherGroupName ] = JSON.parse(
otherMsg );
- } catch ( err ) {
- ve.log( 've.init.mw.Platform: Could not parse
the Special Character list.' );
- ve.log( err );
+ try {
+ characters[ otherGroupName ] = JSON.parse( otherMsg );
+ if ( !characters[ otherGroupName ] ) {
+ delete characters[ otherGroupName ];
}
+ } catch ( err ) {
+ ve.log( 've.init.mw.Platform: Could not parse the
Special Character list.' );
+ ve.log( err );
}
$.each( mw.language.specialCharacters, function ( groupName,
groupCharacters ) {
--
To view, visit https://gerrit.wikimedia.org/r/293746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f0f88495323b74d156c24939ca12840b4b970c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
