Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80134
Change subject: Subscript is one word (and so is superscript for that matter)
......................................................................
Subscript is one word (and so is superscript for that matter)
Objective:
* Unify the capitalization of subscript and superscript
Change-Id: I5a7fbc2d864c896ebb26177cf05c7adddacd8829
---
M modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js
M modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js
M modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
M modules/ve/ui/tools/buttons/ve.ui.SubscriptButtonTool.js
M modules/ve/ui/tools/buttons/ve.ui.SuperscriptButtonTool.js
5 files changed, 44 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/34/80134/1
diff --git a/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js
b/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js
index d8b1cc4..b0cbd29 100644
--- a/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js
+++ b/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js
@@ -196,38 +196,38 @@
ve.ce.annotationFactory.register( ve.ce.TextStyleEmphasizeAnnotation );
/**
- * ContentEditable superScript annotation.
+ * ContentEditable superscript annotation.
*
* @class
* @extends ve.ce.TextStyleAnnotation
* @constructor
- * @param {ve.dm.TextStyleSuperScriptAnnotation} model
+ * @param {ve.dm.TextStyleSuperscriptAnnotation} model
*/
-ve.ce.TextStyleSuperScriptAnnotation = function
VeCeTextStyleSuperScriptAnnotation( model, config ) {
+ve.ce.TextStyleSuperscriptAnnotation = function
VeCeTextStyleSuperscriptAnnotation( model, config ) {
ve.ce.TextStyleAnnotation.call( this, model, config );
- this.$.addClass( 've-ce-TextStyleSuperScriptAnnotation' );
+ this.$.addClass( 've-ce-TextStyleSuperscriptAnnotation' );
};
-ve.inheritClass( ve.ce.TextStyleSuperScriptAnnotation,
ve.ce.TextStyleAnnotation );
-ve.ce.TextStyleSuperScriptAnnotation.static.name = 'textStyle/superScript';
-ve.ce.TextStyleSuperScriptAnnotation.static.tagName = 'sup';
-ve.ce.annotationFactory.register( ve.ce.TextStyleSuperScriptAnnotation );
+ve.inheritClass( ve.ce.TextStyleSuperscriptAnnotation,
ve.ce.TextStyleAnnotation );
+ve.ce.TextStyleSuperscriptAnnotation.static.name = 'textStyle/superscript';
+ve.ce.TextStyleSuperscriptAnnotation.static.tagName = 'sup';
+ve.ce.annotationFactory.register( ve.ce.TextStyleSuperscriptAnnotation );
/**
- * ContentEditable subScript annotation.
+ * ContentEditable subscript annotation.
*
* @class
* @extends ve.ce.TextStyleAnnotation
* @constructor
- * @param {ve.dm.TextStyleSubScriptAnnotation} model
+ * @param {ve.dm.TextStyleSubscriptAnnotation} model
*/
-ve.ce.TextStyleSubScriptAnnotation = function
VeCeTextStyleSubScriptAnnotation( model, config ) {
+ve.ce.TextStyleSubscriptAnnotation = function
VeCeTextStyleSubscriptAnnotation( model, config ) {
ve.ce.TextStyleAnnotation.call( this, model, config );
- this.$.addClass( 've-ce-TextStyleSubScriptAnnotation' );
+ this.$.addClass( 've-ce-TextStyleSubscriptAnnotation' );
};
-ve.inheritClass( ve.ce.TextStyleSubScriptAnnotation, ve.ce.TextStyleAnnotation
);
-ve.ce.TextStyleSubScriptAnnotation.static.name = 'textStyle/subScript';
-ve.ce.TextStyleSubScriptAnnotation.static.tagName = 'sub';
-ve.ce.annotationFactory.register( ve.ce.TextStyleSubScriptAnnotation );
+ve.inheritClass( ve.ce.TextStyleSubscriptAnnotation, ve.ce.TextStyleAnnotation
);
+ve.ce.TextStyleSubscriptAnnotation.static.name = 'textStyle/subscript';
+ve.ce.TextStyleSubscriptAnnotation.static.tagName = 'sub';
+ve.ce.annotationFactory.register( ve.ce.TextStyleSubscriptAnnotation );
/**
* ContentEditable code annotation.
diff --git a/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js
b/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js
index aeb850e..f931f86 100644
--- a/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js
+++ b/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js
@@ -41,8 +41,8 @@
'span': 'span',
'strong': 'strong',
'em': 'emphasize',
- 'sup': 'superScript',
- 'sub': 'subScript',
+ 'sup': 'superscript',
+ 'sub': 'subscript',
'code': 'code',
'tt': 'code'
};
@@ -71,8 +71,8 @@
'span': 'span',
'strong': 'strong',
'emphasize': 'em',
- 'superScript': 'sup',
- 'subScript': 'sub',
+ 'superscript': 'sup',
+ 'subscript': 'sub',
'code': 'code'
};
return [ doc.createElement( nodeNames[
dataElement.type.substring( 10 ) ] ) ];
@@ -248,13 +248,13 @@
* @constructor
* @param {Object} element
*/
-ve.dm.TextStyleSuperScriptAnnotation = function
VeDmTextStyleSuperScriptAnnotation( element ) {
+ve.dm.TextStyleSuperscriptAnnotation = function
VeDmTextStyleSuperscriptAnnotation( element ) {
ve.dm.TextStyleAnnotation.call( this, element );
};
-ve.inheritClass( ve.dm.TextStyleSuperScriptAnnotation,
ve.dm.TextStyleAnnotation );
-ve.dm.TextStyleSuperScriptAnnotation.static.name = 'textStyle/superScript';
-ve.dm.TextStyleSuperScriptAnnotation.static.matchTagNames = ['sup'];
-ve.dm.modelRegistry.register( ve.dm.TextStyleSuperScriptAnnotation );
+ve.inheritClass( ve.dm.TextStyleSuperscriptAnnotation,
ve.dm.TextStyleAnnotation );
+ve.dm.TextStyleSuperscriptAnnotation.static.name = 'textStyle/superscript';
+ve.dm.TextStyleSuperscriptAnnotation.static.matchTagNames = ['sup'];
+ve.dm.modelRegistry.register( ve.dm.TextStyleSuperscriptAnnotation );
/**
* DataModel sub script annotation.
@@ -264,13 +264,13 @@
* @constructor
* @param {Object} element
*/
-ve.dm.TextStyleSubScriptAnnotation = function
VeDmTextStyleSubScriptAnnotation( element ) {
+ve.dm.TextStyleSubscriptAnnotation = function
VeDmTextStyleSubscriptAnnotation( element ) {
ve.dm.TextStyleAnnotation.call( this, element );
};
-ve.inheritClass( ve.dm.TextStyleSubScriptAnnotation, ve.dm.TextStyleAnnotation
);
-ve.dm.TextStyleSubScriptAnnotation.static.name = 'textStyle/subScript';
-ve.dm.TextStyleSubScriptAnnotation.static.matchTagNames = ['sub'];
-ve.dm.modelRegistry.register( ve.dm.TextStyleSubScriptAnnotation );
+ve.inheritClass( ve.dm.TextStyleSubscriptAnnotation, ve.dm.TextStyleAnnotation
);
+ve.dm.TextStyleSubscriptAnnotation.static.name = 'textStyle/subscript';
+ve.dm.TextStyleSubscriptAnnotation.static.matchTagNames = ['sub'];
+ve.dm.modelRegistry.register( ve.dm.TextStyleSubscriptAnnotation );
/**
* DataModel code script annotation.
diff --git a/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
b/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
index 8b239af..5b171de 100644
--- a/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
+++ b/modules/ve/test/ce/ve.ce.ContentBranchNode.test.js
@@ -115,9 +115,9 @@
'msg': 'Superscript text',
'data': [
{ 'type': 'paragraph' },
- ['a', [ { 'type': 'textStyle/superScript' } ]],
- ['b', [ { 'type': 'textStyle/superScript' } ]],
- ['c', [ { 'type': 'textStyle/superScript' } ]],
+ ['a', [ { 'type': 'textStyle/superscript' } ]],
+ ['b', [ { 'type': 'textStyle/superscript' } ]],
+ ['c', [ { 'type': 'textStyle/superscript' } ]],
{ 'type': '/paragraph' }
],
'html': '<sup>abc</sup>'
@@ -126,9 +126,9 @@
'msg': 'Subscript text',
'data': [
{ 'type': 'paragraph' },
- ['a', [ { 'type': 'textStyle/subScript' } ]],
- ['b', [ { 'type': 'textStyle/subScript' } ]],
- ['c', [ { 'type': 'textStyle/subScript' } ]],
+ ['a', [ { 'type': 'textStyle/subscript' } ]],
+ ['b', [ { 'type': 'textStyle/subscript' } ]],
+ ['c', [ { 'type': 'textStyle/subscript' } ]],
{ 'type': '/paragraph' }
],
'html': '<sub>abc</sub>'
diff --git a/modules/ve/ui/tools/buttons/ve.ui.SubscriptButtonTool.js
b/modules/ve/ui/tools/buttons/ve.ui.SubscriptButtonTool.js
index 6d502d3..733cacf 100644
--- a/modules/ve/ui/tools/buttons/ve.ui.SubscriptButtonTool.js
+++ b/modules/ve/ui/tools/buttons/ve.ui.SubscriptButtonTool.js
@@ -31,10 +31,12 @@
ve.ui.SubscriptButtonTool.static.titleMessage =
'visualeditor-annotationbutton-subscript-tooltip';
-ve.ui.SubscriptButtonTool.static.annotation = { 'name': 'textStyle/subScript'
};
+ve.ui.SubscriptButtonTool.static.annotation = { 'name': 'textStyle/subscript'
};
/* Registration */
ve.ui.toolFactory.register( 'subscript', ve.ui.SubscriptButtonTool );
-ve.ui.commandRegistry.register( 'subscript', 'annotation', 'toggle',
'textStyle/subScript' );
+ve.ui.commandRegistry.register(
+ 'textStyle/subscript', 'annotation', 'toggle', 'textStyle/subscript'
+);
diff --git a/modules/ve/ui/tools/buttons/ve.ui.SuperscriptButtonTool.js
b/modules/ve/ui/tools/buttons/ve.ui.SuperscriptButtonTool.js
index 8818a1f..18f8175 100644
--- a/modules/ve/ui/tools/buttons/ve.ui.SuperscriptButtonTool.js
+++ b/modules/ve/ui/tools/buttons/ve.ui.SuperscriptButtonTool.js
@@ -31,10 +31,12 @@
ve.ui.SuperscriptButtonTool.static.titleMessage =
'visualeditor-annotationbutton-superscript-tooltip';
-ve.ui.SuperscriptButtonTool.static.annotation = { 'name':
'textStyle/superScript' };
+ve.ui.SuperscriptButtonTool.static.annotation = { 'name':
'textStyle/superscript' };
/* Registration */
ve.ui.toolFactory.register( 'superscript', ve.ui.SuperscriptButtonTool );
-ve.ui.commandRegistry.register( 'superscript', 'annotation', 'toggle',
'textStyle/superScript' );
+ve.ui.commandRegistry.register(
+ 'textStyle/superscript', 'annotation', 'toggle', 'textStyle/superscript'
+);
--
To view, visit https://gerrit.wikimedia.org/r/80134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a7fbc2d864c896ebb26177cf05c7adddacd8829
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
