From 9eb72f76048c50bb07db210aa7ae154e2b53376b Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 26 Mar 2015 11:44:09 -0700 Subject: [PATCH] Update VE core submodule to master (754d3eb) New changes: b15ffd7 Make triple-click expand to CBNs, not BranchNodes 43f16a7 Initialize this.$window in ve.ui.Toolbar constructor Change-Id: I96ac829a6dd4ef46156460bf7ab9585ed923456d --- .jsduck/eg-iframe.html | 1 + VisualEditor.php | 1 + extension.json | 1 + lib/ve | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 6787e42ba7..61d3c78be7 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -156,6 +156,7 @@ + diff --git a/VisualEditor.php b/VisualEditor.php index e4ada4dd46..cc167b8367 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -392,6 +392,7 @@ $wgResourceModules += array( 'lib/ve/src/dm/ve.dm.APIResultsQueue.js', 'lib/ve/src/dm/ve.dm.ResizableNode.js', 'lib/ve/src/dm/ve.dm.BranchNode.js', + 'lib/ve/src/dm/ve.dm.ContentBranchNode.js', 'lib/ve/src/dm/ve.dm.LeafNode.js', 'lib/ve/src/dm/ve.dm.Annotation.js', 'lib/ve/src/dm/ve.dm.InternalList.js', diff --git a/extension.json b/extension.json index a899959b29..dde5dc27e6 100644 --- a/extension.json +++ b/extension.json @@ -471,6 +471,7 @@ "lib/ve/src/dm/ve.dm.APIResultsQueue.js", "lib/ve/src/dm/ve.dm.ResizableNode.js", "lib/ve/src/dm/ve.dm.BranchNode.js", + "lib/ve/src/dm/ve.dm.ContentBranchNode.js", "lib/ve/src/dm/ve.dm.LeafNode.js", "lib/ve/src/dm/ve.dm.Annotation.js", "lib/ve/src/dm/ve.dm.InternalList.js", diff --git a/lib/ve b/lib/ve index 731b3ad852..754d3ebf27 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 731b3ad852d3e6cf55d0a2f0f054478b03519f55 +Subproject commit 754d3ebf27341697c2f278da8682e1fd53a874d8