Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216141
Change subject: Stop using deprecated aliases for OO.ui.mixin.*
......................................................................
Stop using deprecated aliases for OO.ui.mixin.*
These classes were renamed after OOui v0.11.3.
Update the jsduck categories to match the latest OOui categories
at the same time (to reflect the new mixin category).
Change-Id: I6759bd9a3cca265bbbd422a599a7f21ac0fc6532
---
M .jsduck/categories.json
M src/ce/nodes/ve.ce.CommentNode.js
M src/ui/ve.ui.Context.js
M src/ui/ve.ui.ContextItem.js
4 files changed, 37 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/41/216141/1
diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 31e9dbb..0dde668 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -208,53 +208,50 @@
]
},
{
- "name": "OOJS UI",
+ "name": "OOjs UI",
"groups": [
{
"name": "General",
"classes": [
"OO.ui",
- "OO.ui.ActionSet",
"OO.ui.Element",
- "OO.ui.Layout",
- "OO.ui.Widget",
- "OO.ui.Window",
- "OO.ui.Dialog",
- "OO.ui.WindowManager",
- "OO.ui.Error",
+ "OO.ui.HtmlSnippet",
+ "OO.ui.Toolbar",
+ "OO.ui.Window",
+ "OO.ui.Dialog",
+ "OO.ui.WindowManager",
"OO.ui.Process",
- "OO.ui.HtmlSnippet"
+ "OO.ui.Error",
+ "OO.ui.ActionSet"
]
},
{
- "name": "Elements",
- "classes": ["OO.ui.*Element"]
+ "name": "Factories",
+ "classes": ["OO.ui.*Factory"]
},
{
"name": "Tools",
- "classes": [
- "OO.ui.*Tool",
- "OO.ui.Tool*Factory"
- ]
+ "classes": ["OO.ui.*Tool"]
},
{
- "name": "Toolbar and tool groups",
- "classes": [
- "OO.ui.Toolbar",
- "OO.ui.*ToolGroup"
- ]
- },
- {
- "name": "Dialogs",
- "classes": ["OO.ui.*Dialog"]
+ "name": "Mixins",
+ "classes": ["OO.ui.mixin", "OO.ui.mixin.*"]
},
{
"name": "Layouts",
"classes": ["OO.ui.*Layout"]
},
{
+ "name": "Tool groups",
+ "classes": ["OO.ui.*ToolGroup"]
+ },
+ {
"name": "Widgets",
"classes": ["OO.ui.*Widget"]
+ },
+ {
+ "name": "Dialogs",
+ "classes": ["OO.ui.*Dialog"]
},
{
"name": "Themes",
@@ -266,7 +263,7 @@
"name": "Upstream",
"groups": [
{
- "name": "OOJS",
+ "name": "OOjs",
"classes": ["OO", "OO.EventEmitter",
"OO.Factory", "OO.Registry"]
},
{
diff --git a/src/ce/nodes/ve.ce.CommentNode.js
b/src/ce/nodes/ve.ce.CommentNode.js
index ea830be..7082dcc 100644
--- a/src/ce/nodes/ve.ce.CommentNode.js
+++ b/src/ce/nodes/ve.ce.CommentNode.js
@@ -10,7 +10,7 @@
* @class
* @extends ve.ce.LeafNode
* @mixins ve.ce.FocusableNode
- * @mixins OO.ui.IndicatorElement
+ * @mixins OO.ui.mixin.IndicatorElement
*
* @constructor
* @param {ve.dm.CommentNode} model Model to observe
@@ -22,7 +22,7 @@
// Mixin constructors
ve.ce.FocusableNode.call( this, this.$element, config );
- OO.ui.IndicatorElement.call( this, $.extend( {}, config, {
+ OO.ui.mixin.IndicatorElement.call( this, $.extend( {}, config, {
$indicator: this.$element, indicator: 'alert'
} ) );
@@ -37,7 +37,7 @@
OO.inheritClass( ve.ce.CommentNode, ve.ce.LeafNode );
OO.mixinClass( ve.ce.CommentNode, ve.ce.FocusableNode );
-OO.mixinClass( ve.ce.CommentNode, OO.ui.IndicatorElement );
+OO.mixinClass( ve.ce.CommentNode, OO.ui.mixin.IndicatorElement );
/* Static Properties */
diff --git a/src/ui/ve.ui.Context.js b/src/ui/ve.ui.Context.js
index ae25846..a0e6cfc 100644
--- a/src/ui/ve.ui.Context.js
+++ b/src/ui/ve.ui.Context.js
@@ -10,7 +10,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixins OO.ui.GroupElement
+ * @mixins OO.ui.mixin.GroupElement
*
* @constructor
* @param {ve.ui.Surface} surface
@@ -21,7 +21,7 @@
ve.ui.Context.super.call( this, config );
// Mixin constructors
- OO.ui.GroupElement.call( this, config );
+ OO.ui.mixin.GroupElement.call( this, config );
// Properties
this.surface = surface;
@@ -41,7 +41,7 @@
OO.inheritClass( ve.ui.Context, OO.ui.Element );
-OO.mixinClass( ve.ui.Context, OO.ui.GroupElement );
+OO.mixinClass( ve.ui.Context, OO.ui.mixin.GroupElement );
/* Static Property */
diff --git a/src/ui/ve.ui.ContextItem.js b/src/ui/ve.ui.ContextItem.js
index f5dc017..dda75f1 100644
--- a/src/ui/ve.ui.ContextItem.js
+++ b/src/ui/ve.ui.ContextItem.js
@@ -9,9 +9,9 @@
*
* @class
* @extends OO.ui.Widget
- * @mixins OO.ui.IconElement
- * @mixins OO.ui.LabelElement
- * @mixins OO.ui.PendingElement
+ * @mixins OO.ui.mixin.IconElement
+ * @mixins OO.ui.mixin.LabelElement
+ * @mixins OO.ui.mixin.PendingElement
*
* @constructor
* @param {ve.ui.Context} context Context item is in
@@ -24,9 +24,9 @@
ve.ui.ContextItem.super.call( this, config );
// Mixin constructors
- OO.ui.IconElement.call( this, config );
- OO.ui.LabelElement.call( this, config );
- OO.ui.PendingElement.call( this, config );
+ OO.ui.mixin.IconElement.call( this, config );
+ OO.ui.mixin.LabelElement.call( this, config );
+ OO.ui.mixin.PendingElement.call( this, config );
// Properties
this.context = context;
@@ -74,9 +74,9 @@
/* Inheritance */
OO.inheritClass( ve.ui.ContextItem, OO.ui.Widget );
-OO.mixinClass( ve.ui.ContextItem, OO.ui.IconElement );
-OO.mixinClass( ve.ui.ContextItem, OO.ui.LabelElement );
-OO.mixinClass( ve.ui.ContextItem, OO.ui.PendingElement );
+OO.mixinClass( ve.ui.ContextItem, OO.ui.mixin.IconElement );
+OO.mixinClass( ve.ui.ContextItem, OO.ui.mixin.LabelElement );
+OO.mixinClass( ve.ui.ContextItem, OO.ui.mixin.PendingElement );
/* Events */
--
To view, visit https://gerrit.wikimedia.org/r/216141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6759bd9a3cca265bbbd422a599a7f21ac0fc6532
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
