jenkins-bot has submitted this change and it was merged.
Change subject: Convert VisualEditor Beta Feature to a normal (non-optional)
plugin
......................................................................
Convert VisualEditor Beta Feature to a normal (non-optional) plugin
Change-Id: I0dd1c85ad92d7e42654e23b6237b30f8f4dfe0fa
---
M Math.hooks.php
M Math.php
D images/betafeatures-icon-VisualEditor-formulae-ltr.svg
D images/betafeatures-icon-VisualEditor-formulae-rtl.svg
4 files changed, 1 insertion(+), 446 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Math.hooks.php b/Math.hooks.php
index 60eb2f0..cf20545 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -158,28 +158,6 @@
return true;
}
- public static function onGetBetaPreferences( $user, &$preferences ) {
- global $wgExtensionAssetsPath;
- if ( class_exists( 'VisualEditorHooks' ) ) {
- // Add beta feature if VisualEditor is installed
- $dir =
RequestContext::getMain()->getLanguage()->getDir();
- $preferences['math-enable-visualeditor'] = array(
- 'version' => '1.0',
- 'label-message' =>
'math-preference-mwmathinspector-label',
- 'desc-message' =>
'math-preference-mwmathinspector-description',
- 'screenshot' => $wgExtensionAssetsPath .
-
"/Math/images/betafeatures-icon-VisualEditor-formulae-$dir.svg",
- 'info-message' =>
'math-preference-mwmathinspector-info-link',
- 'discussion-message' =>
'math-preference-mwmathinspector-info-link',
- 'requirements' => array(
- 'betafeatures' => array(
- 'visualeditor-enable',
- ),
- ),
- );
- }
- }
-
/**
* List of message keys for the various math output settings.
*
diff --git a/Math.php b/Math.php
index 34a0ef4..991d4bb 100644
--- a/Math.php
+++ b/Math.php
@@ -179,7 +179,6 @@
$wgExtensionFunctions[] = 'MathHooks::setup';
$wgHooks['ParserFirstCallInit'][] = 'MathHooks::onParserFirstCallInit';
-$wgHooks['GetBetaFeaturePreferences'][] = 'MathHooks::onGetBetaPreferences';
$wgHooks['GetPreferences'][] = 'MathHooks::onGetPreferences';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'MathHooks::onLoadExtensionSchemaUpdates';
$wgHooks['ParserTestTables'][] = 'MathHooks::onParserTestTables';
@@ -469,4 +468,4 @@
'targets' => array( 'desktop', 'mobile' ),
) + $moduleTemplate;
-$wgVisualEditorPreferenceModules['math-enable-visualeditor'] =
'ext.math.visualEditor';
+$wgVisualEditorPluginModules[] = 'ext.math.visualEditor';
diff --git a/images/betafeatures-icon-VisualEditor-formulae-ltr.svg
b/images/betafeatures-icon-VisualEditor-formulae-ltr.svg
deleted file mode 100644
index 72d66ae..0000000
--- a/images/betafeatures-icon-VisualEditor-formulae-ltr.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- version="1.1"
- width="264"
- height="162"
- viewBox="0 0 264 162"
- id="Layer_1"
- xml:space="preserve"><metadata
- id="metadata3213"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs3211" /><g
- id="g3120-2"><polygon
- points="0.5,151.749 0.5,0.5 263.5,0.5 263.5,152.249 254.5,158.954
254.5,42.5 215.5,42.5 215.5,155.1 211.107,151.369 203.5,156.699 203.5,42.5
48.5,42.5 48.5,153.35 38.749,161.38 24.833,151.361 13.366,161.357 "
- id="polygon3122-9"
- style="fill:#ffffff" /><g
- id="g3124-5"><path
- d="m 263,1 v 150.998 l -8,5.96 V 43 42 h -1 -38 -1 v 1 111.02 l
-3.274,-2.781 -0.589,-0.498 -0.633,0.441 -6.504,4.556 V 43 42 H 203 49 48 v 1
110.1 l -9.257,7.66 -13.295,-9.57 -0.645,-0.463 -0.598,0.521 -10.864,9.47 L
1,151.499 V 1 h 262 m 1,-1 H 0 V 152 L 13.391,162 24.865,152 38.756,162
49,153.6 V 43 H 203 V 157.66 L 211.078,152 216,156.18 V 43 h 38 v 116.95 l
10,-7.45 V 0 l 0,0 z"
- id="path3126-5"
- style="fill:#e5e5e5" /></g></g><path
- d="M 203,157.66 V 43 H 49 v 110.6 l 2.145,-1.6 12.555,10 13.809,-10
14.229,10 12.972,-10 12.973,10 13.811,-10 12.136,10 13.391,-10 14.229,10
12.972,-10 12.974,10 5.804,-4.34 z"
- id="path3128-1"
- style="fill:#e5e5e5" /><path
- d="m 11,36 c 0,-7.732 6.268,-14 14,-14 7.732,0 14,6.268 14,14 0,7.732
-6.268,14 -14,14 -7.732,0 -14,-6.268 -14,-14 z"
- id="Ellipse-2"
- style="fill:#e5e5e5" /><path
- d="M 254,159.95 V 43 h -38 v 113.18 l 7.551,5.82 13.811,-10 13.891,10
2.747,-2.05 z"
- id="path3131-8"
- style="fill:#e5e5e5" /><path
- d="M 38,107 V 72 H 13 v 35 h 25 z"
- id="path3133-5"
- style="fill:#e5e5e5" /><path
- d="m 232.51,5 h 26 v 6 h -26 V 5 z"
- id="path3135-8"
- style="fill:#e5e5e5" /><rect
- width="22"
- height="6"
- x="208.51001"
- y="5"
- id="rect3137-5"
- style="fill:#e5e5e5" /><path
- d="m 142,6 v 4 H 50 V 6 h 92 m 1,-1 H 49 v 6 h 94 V 5 l 0,0 z"
- id="path3139-9"
- style="fill:#e5e5e5" /><rect
- width="22"
- height="6"
- x="184.51001"
- y="5"
- id="rect3141-9"
- style="fill:#e5e5e5" /><rect
- width="13"
- height="6"
- x="161.51001"
- y="5"
- id="rect3143-3"
- style="fill:#e5e5e5" /><rect
- width="6"
- height="6"
- x="176.51001"
- y="5"
- id="rect3145-7"
- style="fill:#e5e5e5" /><rect
- width="6"
- height="6"
- x="153.51001"
- y="5"
- id="rect3147-6"
- style="fill:#e5e5e5" /><rect
- width="32"
- height="6"
- x="9"
- y="5"
- id="rect3149-5"
- style="fill:#e5e5e5" /><path
- d="M 2,14.5 H 262"
- id="path3151-9"
- style="fill:#e5e5e5;stroke:#e5e5e5" /><rect
- width="2"
- height="2"
- x="52"
- y="7"
- id="rect3153-5"
- style="fill:#e5e5e5" /><path
- d="M 38,59 V 54 H 13 v 5 h 25 z"
- id="path3155-4"
- style="fill:#e5e5e5" /><g
- id="g3157-6"><path
- d="M 202.957,157.619 V 42.958 h -154 v 110.601 l 2.145,-1.6 12.556,10
13.809,-10 14.229,10 12.972,-10 12.973,10 13.811,-10 12.136,10 13.391,-10
14.229,10 12.973,-10 12.973,10 5.803,-4.34 z"
- id="path3159-6"
- style="fill:#e4e4e4" /></g><g
- id="g3161-2"
- style="opacity:0.2"><rect
- width="156.08501"
- height="21.667"
- x="48.040001"
- y="42.041"
- id="rect3163-6"
- style="fill:#4f89c8" /></g><g
- id="g3165-8"
- style="opacity:0.8"><rect
- width="54"
- height="5.9990001"
- x="58.957001"
- y="72.292"
- id="rect3167-5"
- style="fill:#cccbcb" /></g><g
- id="g3169-6"
- style="opacity:0.3"><path
- d="m 189.957,84.293 h -39 v 30 h 39 v -30 z m -26.348,13.043 h 1.402 l
8.701,8.604 4.725,-2.834 7.117,5.943 v 0.025 h -31.148 l 9.203,-11.738 z"
- id="path3171-4"
- style="fill:#9b9b9b" /></g><g
- id="g3173-1"
- style="opacity:0.8"><rect
- width="131"
- height="3"
- x="58.957001"
- y="123.293"
- id="rect3175-5"
- style="fill:#cccbcb" /></g><g
- id="g3177-3"
- style="opacity:0.8"><rect
- width="104"
- height="3"
- x="58.957001"
- y="133.293"
- id="rect3179-0"
- style="fill:#cccbcb" /></g><g
- id="g3181-8"
- style="opacity:0.8"><rect
- width="84"
- height="3"
- x="58.957001"
- y="89.292999"
- id="rect3183-5"
- style="fill:#cccbcb" /></g><g
- id="g3185-7"
- style="opacity:0.8"><rect
- width="84"
- height="3"
- x="58.957001"
- y="99.292999"
- id="rect3187-5"
- style="fill:#cccbcb" /></g><g
- id="g3189-6"
- style="opacity:0.8"><rect
- width="39"
- height="3"
- x="58.957001"
- y="109.293"
- id="rect3191-0"
- style="fill:#cccbcb" /></g><g
- id="g3193-4"
- style="opacity:0.4"><g
- id="g3195-4"><path
- d="m 58.957,48.291 h 25 v 10 h -25 v -10 z"
- id="path3197-0"
- style="fill:#9b9b9b" /></g><g
- id="g3199-1"><rect
- width="10"
- height="10"
- x="92.457001"
- y="48.291"
- id="rect3201-3"
- style="fill:#9b9b9b" /></g><g
- id="g3203-9"><rect
- width="10"
- height="10"
- x="109.457"
- y="48.291"
- id="rect3205-6"
- style="fill:#9b9b9b" /></g></g><g
- transform="translate(129.3,41.6)"
- id="math-2"
- style="opacity:0.75;fill:#222222;fill-opacity:1"><path
- d="M 13.609,11.391 10.004,16.004 16,16 l 0,-1 1,0 0,3 -10,0 5,-6 -5,-6
10,0 0,3 -1,0 0,-2 -6,0 3.609,4.391"
- id="sigma-7"
- style="fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none"
/></g></svg>
\ No newline at end of file
diff --git a/images/betafeatures-icon-VisualEditor-formulae-rtl.svg
b/images/betafeatures-icon-VisualEditor-formulae-rtl.svg
deleted file mode 100644
index 15a2aa9..0000000
--- a/images/betafeatures-icon-VisualEditor-formulae-rtl.svg
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- version="1.1"
- width="264"
- height="162"
- viewBox="0 0 264 162"
- id="Layer_1"
- xml:space="preserve"
- inkscape:version="0.48.4 r9939"
-
sodipodi:docname="betafeatures-icon-VisualEditor-formulae-ltr.svg"><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview51"
- showgrid="false"
- inkscape:zoom="1.1022727"
- inkscape:cx="132"
- inkscape:cy="81"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="0"
- inkscape:current-layer="Layer_1" /><metadata
- id="metadata3213"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs3211" /><g
- id="g3120-2"
- transform="matrix(-1,0,0,1,264,0)"><polygon
- points="0.5,0.5 263.5,0.5 263.5,152.249 254.5,158.954 254.5,42.5
215.5,42.5 215.5,155.1 211.107,151.369 203.5,156.699 203.5,42.5 48.5,42.5
48.5,153.35 38.749,161.38 24.833,151.361 13.366,161.357 0.5,151.749 "
- id="polygon3122-9"
- style="fill:#ffffff" /><g
- id="g3124-5"><path
- d="m 263,1 v 150.998 l -8,5.96 V 43 42 h -1 -38 -1 v 1 111.02 l
-3.274,-2.781 -0.589,-0.498 -0.633,0.441 -6.504,4.556 V 43 42 H 203 49 48 v 1
110.1 l -9.257,7.66 -13.295,-9.57 -0.645,-0.463 -0.598,0.521 -10.864,9.47 L
1,151.499 V 1 h 262 m 1,-1 H 0 V 152 L 13.391,162 24.865,152 38.756,162
49,153.6 V 43 H 203 V 157.66 L 211.078,152 216,156.18 V 43 h 38 v 116.95 l
10,-7.45 V 0 l 0,0 z"
- id="path3126-5"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /></g></g><path
- d="M 61,157.66 V 43 H 215 V 153.6 L 212.855,152 200.3,162 186.491,152
172.262,162 159.29,152 146.317,162 132.506,152 120.37,162 106.979,152 92.75,162
79.778,152 66.804,162 61,157.66 z"
- id="path3128-1"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><path
- d="m 253,36 c 0,-7.732 -6.268,-14 -14,-14 -7.732,0 -14,6.268 -14,14
0,7.732 6.268,14 14,14 7.732,0 14,-6.268 14,-14 z"
- id="Ellipse-2"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><path
- d="M 10,159.95 V 43 H 48 V 156.18 L 40.449,162 26.638,152 12.747,162
10,159.95 z"
- id="path3131-8"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><path
- d="M 226,107 V 72 h 25 v 35 h -25 z"
- id="path3133-5"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><path
- d="m 31.49,5 h -26 v 6 h 26 V 5 z"
- id="path3135-8"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><rect
- width="22"
- height="6"
- x="-55.48999"
- y="5"
- id="rect3137-5"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><path
- d="m 122,6 v 4 h 92 V 6 h -92 m -1,-1 h 94 v 6 H 121 V 5 l 0,0 z"
- id="path3139-9"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><rect
- width="22"
- height="6"
- x="-79.48999"
- y="5"
- id="rect3141-9"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><rect
- width="13"
- height="6"
- x="-102.48999"
- y="5"
- id="rect3143-3"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><rect
- width="6"
- height="6"
- x="-87.48999"
- y="5"
- id="rect3145-7"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><rect
- width="6"
- height="6"
- x="-110.48999"
- y="5"
- id="rect3147-6"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><rect
- width="32"
- height="6"
- x="-255"
- y="5"
- id="rect3149-5"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><path
- d="M 262,14.5 H 2"
- id="path3151-9"
- style="fill:#e5e5e5;stroke:#e5e5e5"
- inkscape:connector-curvature="0" /><rect
- width="2"
- height="2"
- x="-212"
- y="7"
- id="rect3153-5"
- style="fill:#e5e5e5"
- transform="scale(-1,1)" /><path
- d="m 226,59 v -5 h 25 v 5 h -25 z"
- id="path3155-4"
- style="fill:#e5e5e5"
- inkscape:connector-curvature="0" /><g
- id="g3157-6"
- transform="matrix(-1,0,0,1,264,0)"><path
- d="M 202.957,157.619 V 42.958 h -154 v 110.601 l 2.145,-1.6 12.556,10
13.809,-10 14.229,10 12.972,-10 12.973,10 13.811,-10 12.136,10 13.391,-10
14.229,10 12.973,-10 12.973,10 5.803,-4.34 z"
- id="path3159-6"
- style="fill:#e4e4e4"
- inkscape:connector-curvature="0" /></g><g
- id="g3161-2"
- style="opacity:0.2"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="156.08501"
- height="21.667"
- x="48.040001"
- y="42.041"
- id="rect3163-6"
- style="fill:#4f89c8" /></g><g
- id="g3165-8"
- style="opacity:0.8"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="54"
- height="5.9990001"
- x="58.957001"
- y="72.292"
- id="rect3167-5"
- style="fill:#cccbcb" /></g><g
- id="g3169-6"
- style="opacity:0.3"
- transform="matrix(-1,0,0,1,264,0)"><path
- d="m 189.957,84.293 h -39 v 30 h 39 v -30 z m -26.348,13.043 h 1.402 l
8.701,8.604 4.725,-2.834 7.117,5.943 v 0.025 h -31.148 l 9.203,-11.738 z"
- id="path3171-4"
- style="fill:#9b9b9b"
- inkscape:connector-curvature="0" /></g><g
- id="g3173-1"
- style="opacity:0.8"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="131"
- height="3"
- x="58.957001"
- y="123.293"
- id="rect3175-5"
- style="fill:#cccbcb" /></g><g
- id="g3177-3"
- style="opacity:0.8"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="104"
- height="3"
- x="58.957001"
- y="133.293"
- id="rect3179-0"
- style="fill:#cccbcb" /></g><g
- id="g3181-8"
- style="opacity:0.8"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="84"
- height="3"
- x="58.957001"
- y="89.292999"
- id="rect3183-5"
- style="fill:#cccbcb" /></g><g
- id="g3185-7"
- style="opacity:0.8"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="84"
- height="3"
- x="58.957001"
- y="99.292999"
- id="rect3187-5"
- style="fill:#cccbcb" /></g><g
- id="g3189-6"
- style="opacity:0.8"
- transform="matrix(-1,0,0,1,264,0)"><rect
- width="39"
- height="3"
- x="58.957001"
- y="109.293"
- id="rect3191-0"
- style="fill:#cccbcb" /></g><g
- id="g3193-4"
- style="opacity:0.4"
- transform="matrix(-1,0,0,1,264,0)"><g
- id="g3195-4"><path
- d="m 58.957,48.291 h 25 v 10 h -25 v -10 z"
- id="path3197-0"
- style="fill:#9b9b9b"
- inkscape:connector-curvature="0" /></g><g
- id="g3199-1"><rect
- width="10"
- height="10"
- x="92.457001"
- y="48.291"
- id="rect3201-3"
- style="fill:#9b9b9b" /></g><g
- id="g3203-9"><rect
- width="10"
- height="10"
- x="109.457"
- y="48.291"
- id="rect3205-6"
- style="fill:#9b9b9b" /></g></g><g
- transform="translate(110.7,41.6)"
- id="math-2"
- style="opacity:0.75;fill:#222222;fill-opacity:1"><path
- d="M 13.609,11.391 10.004,16.004 16,16 l 0,-1 1,0 0,3 -10,0 5,-6 -5,-6
10,0 0,3 -1,0 0,-2 -6,0 3.609,4.391"
- id="sigma-7"
- style="fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none"
- inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/130479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0dd1c85ad92d7e42654e23b6237b30f8f4dfe0fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
