jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (a7cd696)
......................................................................
Update VE core submodule to master (a7cd696)
New changes:
181561b Support generic data transfer handlers
ecdb379 Only replace selection when we know it has changed
afb37fd Remove some errant references to MediaWiki/Parsoid that don't belong
82f57e0 Update OOjs UI to v0.8.0
489ff8a Simplify AlignableNode by inheriting from ClassAttributeNode
bac7e30 Try html/plain text drop if no file handlers found
Change-Id: Id75692418c331191ea638128fe835350e334837d
---
M .docs/categories.json
M .docs/config.json
M .docs/eg-iframe.html
M VisualEditor.php
M extension.json
M lib/ve
6 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/categories.json b/.docs/categories.json
index 16b981e..5de97ac 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -123,6 +123,7 @@
"ve.ui.DebugBar",
"ve.ui.Trigger",
"ve.ui.*TransferHandler",
+ "ve.ui.DataTransferItem",
"ve.ui.*Action",
"ve.ui.*Command",
"ve.ui.*Factory",
diff --git a/.docs/config.json b/.docs/config.json
index e30b787..38597c6 100644
--- a/.docs/config.json
+++ b/.docs/config.json
@@ -6,7 +6,7 @@
"--warnings": ["-nodoc(class,public)"],
"--builtin-classes": true,
"--warnings-exit-nonzero": true,
- "--external":
"HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File",
+ "--external":
"HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,DataTransferItem",
"--output": "../docs",
"--": [
"./external.js",
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 82fcd6a..89a5c97 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -5,7 +5,7 @@
<title>VisualEditor Example</title>
<!-- oojs-ui-apex -->
- <link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex.svg.css">
+ <link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex.vector.css">
<!-- visualEditor.core.build -->
<link rel=stylesheet
href="lib/ve/src/ce/styles/nodes/ve.ce.FocusableNode.css" class="stylesheet-ve">
@@ -231,6 +231,7 @@
<script src="lib/ve/src/ce/ve.ce.BranchNode.js"></script>
<script src="lib/ve/src/ce/ve.ce.ContentBranchNode.js"></script>
<script src="lib/ve/src/ce/ve.ce.LeafNode.js"></script>
+ <script
src="lib/ve/src/ce/ve.ce.ClassAttributeNode.js"></script>
<script src="lib/ve/src/ce/ve.ce.AlignableNode.js"></script>
<script src="lib/ve/src/ce/ve.ce.FocusableNode.js"></script>
<script src="lib/ve/src/ce/ve.ce.ResizableNode.js"></script>
@@ -302,6 +303,7 @@
<script src="lib/ve/src/ui/ve.ui.Action.js"></script>
<script src="lib/ve/src/ui/ve.ui.ActionFactory.js"></script>
<script
src="lib/ve/src/ui/ve.ui.DataTransferHandler.js"></script>
+ <script
src="lib/ve/src/ui/ve.ui.FileTransferHandler.js"></script>
<script
src="lib/ve/src/ui/ve.ui.DataTransferHandlerFactory.js"></script>
<script src="lib/ve/src/ui/ve.ui.WindowManager.js"></script>
<script
src="lib/ve/src/ui/actions/ve.ui.AnnotationAction.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index d7378fb..432c3c3 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -467,6 +467,7 @@
'lib/ve/src/ce/ve.ce.BranchNode.js',
'lib/ve/src/ce/ve.ce.ContentBranchNode.js',
'lib/ve/src/ce/ve.ce.LeafNode.js',
+ 'lib/ve/src/ce/ve.ce.ClassAttributeNode.js',
'lib/ve/src/ce/ve.ce.AlignableNode.js',
'lib/ve/src/ce/ve.ce.FocusableNode.js',
'lib/ve/src/ce/ve.ce.ResizableNode.js',
@@ -542,6 +543,7 @@
'lib/ve/src/ui/ve.ui.Action.js',
'lib/ve/src/ui/ve.ui.ActionFactory.js',
'lib/ve/src/ui/ve.ui.DataTransferHandler.js',
+ 'lib/ve/src/ui/ve.ui.FileTransferHandler.js',
'lib/ve/src/ui/ve.ui.DataTransferHandlerFactory.js',
'lib/ve/src/ui/ve.ui.WindowManager.js',
diff --git a/extension.json b/extension.json
index bb9d970..8ddaf34 100644
--- a/extension.json
+++ b/extension.json
@@ -539,6 +539,7 @@
"lib/ve/src/ce/ve.ce.BranchNode.js",
"lib/ve/src/ce/ve.ce.ContentBranchNode.js",
"lib/ve/src/ce/ve.ce.LeafNode.js",
+ "lib/ve/src/ce/ve.ce.ClassAttributeNode.js",
"lib/ve/src/ce/ve.ce.AlignableNode.js",
"lib/ve/src/ce/ve.ce.FocusableNode.js",
"lib/ve/src/ce/ve.ce.ResizableNode.js",
@@ -609,6 +610,7 @@
"lib/ve/src/ui/ve.ui.Action.js",
"lib/ve/src/ui/ve.ui.ActionFactory.js",
"lib/ve/src/ui/ve.ui.DataTransferHandler.js",
+ "lib/ve/src/ui/ve.ui.FileTransferHandler.js",
"lib/ve/src/ui/ve.ui.DataTransferHandlerFactory.js",
"lib/ve/src/ui/ve.ui.WindowManager.js",
"lib/ve/src/ui/actions/ve.ui.AnnotationAction.js",
diff --git a/lib/ve b/lib/ve
index 032c9a4..a7cd696 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 032c9a4cb0ab9967b1999b3cf0768e9c98f0ca8f
+Subproject commit a7cd696ed56d256f9c65d2b3e3287a93ecfe3e43
--
To view, visit https://gerrit.wikimedia.org/r/191532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id75692418c331191ea638128fe835350e334837d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
