jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (5f4b740)
......................................................................
Update VE core submodule to master (5f4b740)
New changes:
a047e72 [BREAKING CHANGE] Create ve.dm.Focusable and store focusable flag there
Local changes:
* Add new ve.dm.FocusableNode mixin where required
Change-Id: Ie9ee2de05acfe3c4c62c4864e65bd20397d6a069
---
M .docs/eg-iframe.html
M VisualEditor.php
M lib/ve
M modules/ve-mw/ce/nodes/ve.ce.MWNumberedExternalLinkNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
10 files changed, 35 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 103a5e8..55e6c54 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -123,6 +123,7 @@
<script src="lib/ve/src/dm/ve.dm.AnnotationFactory.js"></script>
<script src="lib/ve/src/dm/ve.dm.AnnotationSet.js"></script>
<script src="lib/ve/src/dm/ve.dm.MetaItemFactory.js"></script>
+ <script src="lib/ve/src/dm/ve.dm.FocusableNode.js"></script>
<script src="lib/ve/src/dm/ve.dm.Scalable.js"></script>
<script src="lib/ve/src/dm/ve.dm.ResizableNode.js"></script>
<script src="lib/ve/src/dm/ve.dm.Node.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index 2aea2c7..350f773 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -333,6 +333,7 @@
'lib/ve/src/dm/ve.dm.AnnotationSet.js',
'lib/ve/src/dm/ve.dm.MetaItemFactory.js',
'lib/ve/src/dm/ve.dm.Node.js',
+ 'lib/ve/src/dm/ve.dm.FocusableNode.js',
'lib/ve/src/dm/ve.dm.Scalable.js',
'lib/ve/src/dm/ve.dm.ResizableNode.js',
'lib/ve/src/dm/ve.dm.BranchNode.js',
diff --git a/lib/ve b/lib/ve
index 3e09af1..5f4b740 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 3e09af18d0a866d1c54bf75c8703f133fd2354e9
+Subproject commit 5f4b740ea0b9c8b94ee807e717d8017b39cc9661
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWNumberedExternalLinkNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWNumberedExternalLinkNode.js
index b2937d8..16d7ad8 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWNumberedExternalLinkNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWNumberedExternalLinkNode.js
@@ -10,6 +10,7 @@
*
* @class
* @extends ve.ce.LeafNode
+ * @mixins ve.ce.FocusableNode
* @constructor
* @param {ve.dm.MWNumberedExternalLinkNode} model Model to observe
* @param {Object} [config] Configuration options
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index a1d9b8e..2ed43a6 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -10,6 +10,7 @@
*
* @class
* @abstract
+ * @mixins ve.dm.FocusableNode
* @mixins ve.dm.GeneratedContentNode
*
* @constructor
@@ -17,10 +18,13 @@
ve.dm.MWExtensionNode = function VeDmMWExtensionNode() {
// Mixin constructors
ve.dm.GeneratedContentNode.call( this );
+ ve.dm.FocusableNode.call( this );
};
/* Inheritance */
+OO.mixinClass( ve.dm.MWExtensionNode, ve.dm.FocusableNode );
+
OO.mixinClass( ve.dm.MWExtensionNode, ve.dm.GeneratedContentNode );
/* Static members */
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index 33b8368..4d525b5 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -11,6 +11,7 @@
* @class
* @abstract
* @extends ve.dm.GeneratedContentNode
+ * @mixins ve.dm.FocusableNode
* @mixins ve.dm.ResizableNode
*
* @constructor
@@ -18,8 +19,10 @@
ve.dm.MWImageNode = function VeDmMWImageNode() {
// Parent constructor
ve.dm.GeneratedContentNode.call( this );
- // Mixin constructor
+
+ // Mixin constructors
ve.dm.ResizableNode.call( this );
+ ve.dm.FocusableNode.call( this );
this.scalablePromise = null;
@@ -44,6 +47,8 @@
OO.inheritClass( ve.dm.MWImageNode, ve.dm.GeneratedContentNode );
+OO.mixinClass( ve.dm.MWImageNode, ve.dm.FocusableNode );
+
OO.mixinClass( ve.dm.MWImageNode, ve.dm.ResizableNode );
/* Static methods */
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
index 19a98a9..ae317b7 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js
@@ -10,6 +10,7 @@
*
* @class
* @extends ve.dm.LeafNode
+ * @mixins ve.dm.FocusableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -17,12 +18,17 @@
ve.dm.MWNumberedExternalLinkNode = function VeDmMWNumberedExternalLinkNode() {
// Parent constructor
ve.dm.LeafNode.apply( this, arguments );
+
+ // Mixin constructors
+ ve.dm.FocusableNode.call( this );
};
/* Inheritance */
OO.inheritClass( ve.dm.MWNumberedExternalLinkNode, ve.dm.LeafNode );
+OO.mixinClass( ve.dm.MWNumberedExternalLinkNode, ve.dm.FocusableNode );
+
/* Static Properties */
ve.dm.MWNumberedExternalLinkNode.static.name = 'link/mwNumberedExternal';
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 96acf4d..b811a08 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -10,6 +10,7 @@
*
* @class
* @extends ve.dm.LeafNode
+ * @mixins ve.dm.FocusableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -17,6 +18,9 @@
ve.dm.MWReferenceNode = function VeDmMWReferenceNode() {
// Parent constructor
ve.dm.LeafNode.apply( this, arguments );
+
+ // Mixin constructors
+ ve.dm.FocusableNode.call( this );
// Event handlers
this.connect( this, {
@@ -29,6 +33,8 @@
OO.inheritClass( ve.dm.MWReferenceNode, ve.dm.LeafNode );
+OO.mixinClass( ve.dm.MWReferenceNode, ve.dm.FocusableNode );
+
/* Static members */
ve.dm.MWReferenceNode.static.name = 'mwReference';
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js
index bb4adda..08f72bd 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferencesListNode.js
@@ -10,6 +10,7 @@
*
* @class
* @extends ve.dm.BranchNode
+ * @mixins ve.dm.FocusableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -18,12 +19,17 @@
ve.dm.MWReferencesListNode = function VeDmMWReferencesListNode() {
// Parent constructor
ve.dm.BranchNode.apply( this, arguments );
+
+ // Mixin constructors
+ ve.dm.FocusableNode.call( this );
};
/* Inheritance */
OO.inheritClass( ve.dm.MWReferencesListNode, ve.dm.BranchNode );
+OO.mixinClass( ve.dm.MWReferencesListNode, ve.dm.FocusableNode );
+
/* Static members */
ve.dm.MWReferencesListNode.static.name = 'mwReferencesList';
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 80f827a..fd9e48f 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -12,6 +12,7 @@
* @abstract
* @extends ve.dm.LeafNode
* @mixins ve.dm.GeneratedContentNode
+ * @mixins ve.dm.FocusableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -22,6 +23,7 @@
// Mixin constructors
ve.dm.GeneratedContentNode.call( this );
+ ve.dm.FocusableNode.call( this );
// Properties
this.partsList = null;
@@ -36,6 +38,8 @@
OO.mixinClass( ve.dm.MWTransclusionNode, ve.dm.GeneratedContentNode );
+OO.mixinClass( ve.dm.MWTransclusionNode, ve.dm.FocusableNode );
+
/* Static members */
ve.dm.MWTransclusionNode.static.name = 'mwTransclusion';
--
To view, visit https://gerrit.wikimedia.org/r/159642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9ee2de05acfe3c4c62c4864e65bd20397d6a069
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
