jenkins-bot has submitted this change and it was merged.

Change subject: Load all of WikiEditor's special characters
......................................................................


Load all of WikiEditor's special characters

Relies on If9c5cdbe and I8fafd734

Bug: T91608
Change-Id: I3fafc561ceae969e4ecc12881154cd8a3568bebb
---
M VisualEditor.hooks.php
M VisualEditor.php
M extension.json
M modules/ve-mw/init/ve.init.mw.Platform.js
4 files changed, 26 insertions(+), 2 deletions(-)

Approvals:
  Trevor Parscal: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 9cefd38..27ae9d9 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -17,7 +17,7 @@
                // parties who attempt to install VisualEditor onto non-alpha 
wikis, as
                // this should have no impact on deploying to Wikimedia's wiki 
cluster;
                // is fine for release tarballs because 1.22wmf11 < 1.22alpha < 
1.22.0.
-               wfUseMW( '1.25wmf22' );
+               wfUseMW( '1.25wmf24' );
        }
 
        /**
diff --git a/VisualEditor.php b/VisualEditor.php
index 5c226b9..9328af1 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -899,6 +899,7 @@
                        'jquery.autoEllipsis',
                        'jquery.byteLimit',
                        'mediawiki.skinning.content.parsoid',
+                       'mediawiki.language.specialCharacters',
                ),
                'messages' => array(
                        'visualeditor-beta-label',
diff --git a/extension.json b/extension.json
index 5a9f418..9049793 100644
--- a/extension.json
+++ b/extension.json
@@ -938,7 +938,8 @@
                                "mediawiki.jqueryMsg",
                                "jquery.autoEllipsis",
                                "jquery.byteLimit",
-                               "mediawiki.skinning.content.parsoid"
+                               "mediawiki.skinning.content.parsoid",
+                               "mediawiki.language.specialCharacters"
                        ],
                        "messages": [
                                "visualeditor-beta-label",
diff --git a/modules/ve-mw/init/ve.init.mw.Platform.js 
b/modules/ve-mw/init/ve.init.mw.Platform.js
index 736ccc9..a732a4a 100644
--- a/modules/ve-mw/init/ve.init.mw.Platform.js
+++ b/modules/ve-mw/init/ve.init.mw.Platform.js
@@ -109,6 +109,28 @@
        return mw.language.getFallbackLanguageChain();
 };
 
+/**
+ * @inheritdoc
+ */
+ve.init.mw.Platform.prototype.fetchSpecialCharList = function () {
+       var characters = {},
+               groupObject;
+       $.each( mw.language.specialCharacters, function ( groupName, 
groupCharacters ) {
+               groupObject = {};
+               $.each( groupCharacters, function ( charKey, charVal ) {
+                       if ( typeof charVal === 'string' ) {
+                               // VE can only handle the strings right now
+                               // (which is the vast majority of the entries)
+                               groupObject[charVal] = charVal;
+                       }
+               } );
+               characters[mw.msg( 'special-characters-group-' + groupName )] = 
groupObject;
+       } );
+
+       // This implementation always resolves instantly
+       return $.Deferred().resolve( characters ).promise();
+};
+
 /* Initialization */
 
 ve.init.platform = new ve.init.mw.Platform();

-- 
To view, visit https://gerrit.wikimedia.org/r/197357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fafc561ceae969e4ecc12881154cd8a3568bebb
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to