jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (8ca8c41)
......................................................................
Update VE core submodule to master (8ca8c41)
Local changes:
* Rename paste rules to import rules (also used by drag and drop)
New changes:
f5d83f8 Remove data-parsoid removal hack
99f938f Create 'preserveGenerated' mode for cloneElements and use in copy
938b44d [BREAKING CHANGE] Rename paste rules to import rules
c51288c ve.ce.Surface: Move insert HTML path to DM
10ce4cf Provide a FileDropHandler for HTML files
701bb9c Provide a FileDropHandler for CSV and TSV files
ca6b444 build: Update update-oojs.sh and update-oojs-ui.sh scripts
Change-Id: I5cfa15ab3efd03e2c64c2f9f725cb3098f53b32a
---
M .docs/eg-iframe.html
M VisualEditor.php
M lib/ve
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
7 files changed, 27 insertions(+), 14 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 507eb53..8ff57d1 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -93,6 +93,9 @@
<script
src="lib/ve/lib/jquery.uls/src/jquery.uls.data.js"></script>
<script
src="lib/ve/lib/jquery.uls/src/jquery.uls.data.utils.js"></script>
+ <!-- papaparse -->
+ <script src="lib/ve/lib/papaparse/papaparse.js"></script>
+
<!-- unicodejs -->
<script src="lib/ve/lib/unicodejs/unicodejs.js"></script>
@@ -305,7 +308,9 @@
<script
src="lib/ve/src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.NodeDialog.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js"></script>
+ <script
src="lib/ve/src/ui/filedrophandlers/ve.ui.DSVFileDropHandler.js"></script>
<script
src="lib/ve/src/ui/filedrophandlers/ve.ui.PlainTextFileDropHandler.js"></script>
+ <script
src="lib/ve/src/ui/filedrophandlers/ve.ui.HTMLFileDropHandler.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.LanguageSearchWidget.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.LanguageResultWidget.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.LanguageSearchDialog.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index c1c4fb5..747fb41 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -152,6 +152,11 @@
'dependencies' => 'unicodejs'
),
+ 'papaparse' => $wgVisualEditorResourceTemplate + array(
+ 'scripts' => 'lib/ve/lib/papaparse/papaparse.js',
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
+
'rangefix' => $wgVisualEditorResourceTemplate + array(
'scripts' => 'lib/ve/lib/rangefix/rangefix.js',
'targets' => array( 'desktop', 'mobile' )
@@ -556,7 +561,9 @@
'lib/ve/src/ui/dialogs/ve.ui.FragmentDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.NodeDialog.js',
+
'lib/ve/src/ui/filedrophandlers/ve.ui.DSVFileDropHandler.js',
'lib/ve/src/ui/filedrophandlers/ve.ui.PlainTextFileDropHandler.js',
+
'lib/ve/src/ui/filedrophandlers/ve.ui.HTMLFileDropHandler.js',
'lib/ve/src/ui/widgets/ve.ui.SurfaceWidget.js',
'lib/ve/src/ui/widgets/ve.ui.LinkTargetInputWidget.js',
@@ -624,6 +631,7 @@
),
'dependencies' => array(
'unicodejs',
+ 'papaparse',
'jquery.uls.data',
'ext.visualEditor.base',
),
diff --git a/lib/ve b/lib/ve
index 2d8aeef..8ca8c41 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 2d8aeef7737c395dfa388f24bfa25583eda5d8d0
+Subproject commit 8ca8c41ca87f6e34bd8967e906152dea6107a13a
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 612bd2b..c545f86 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -432,7 +432,7 @@
},
history: 'updateToolbarSaveButtonState'
} );
- this.surface.setPasteRules( this.constructor.static.pasteRules );
+ this.surface.setImportRules( this.constructor.static.importRules );
// TODO: mwTocWidget should probably live in a ve.ui.MWSurface subclass
if ( mw.config.get( 'wgVisualEditorConfig' ).enableTocWidget ) {
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5574aac..2cab8e5 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -243,7 +243,7 @@
}
];
-ve.init.mw.Target.static.pasteRules = {
+ve.init.mw.Target.static.importRules = {
external: {
blacklist: [
// Annotations
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index b75665b..905ff2e 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -98,18 +98,18 @@
];
/**
- * Get the paste rules for the surface widget in the dialog
+ * Get the import rules for the surface widget in the dialog
*
* @see ve.dm.ElementLinearData#sanitize
- * @return {Object} Paste rules
+ * @return {Object} Import rules
*/
-ve.ui.MWMediaDialog.static.getPasteRules = function () {
+ve.ui.MWMediaDialog.static.getImportRules = function () {
return ve.extendObject(
- ve.copy( ve.init.target.constructor.static.pasteRules ),
+ ve.copy( ve.init.target.constructor.static.importRules ),
{
all: {
blacklist: OO.simpleArrayUnion(
- ve.getProp(
ve.init.target.constructor.static.pasteRules, 'all', 'blacklist' ) || [],
+ ve.getProp(
ve.init.target.constructor.static.importRules, 'all', 'blacklist' ) || [],
[
// Tables (but not lists) are
possible in wikitext with a leading
// line break but we prevent
creating these with the UI
@@ -836,7 +836,7 @@
$: this.$,
tools: ve.init.target.constructor.static.toolbarGroups,
excludeCommands:
this.constructor.static.excludeCommands,
- pasteRules: this.constructor.static.getPasteRules()
+ importRules: this.constructor.static.getImportRules()
}
);
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 2ed713a..f80720c 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -97,18 +97,18 @@
];
/**
- * Get the paste rules for the surface widget in the dialog
+ * Get the import rules for the surface widget in the dialog
*
* @see ve.dm.ElementLinearData#sanitize
- * @return {Object} Paste rules
+ * @return {Object} Import rules
*/
-ve.ui.MWReferenceDialog.static.getPasteRules = function () {
+ve.ui.MWReferenceDialog.static.getImportRules = function () {
return ve.extendObject(
- ve.copy( ve.init.target.constructor.static.pasteRules ),
+ ve.copy( ve.init.target.constructor.static.importRules ),
{
all: {
blacklist: OO.simpleArrayUnion(
- ve.getProp(
ve.init.target.constructor.static.pasteRules, 'all', 'blacklist' ) || [],
+ ve.getProp(
ve.init.target.constructor.static.importRules, 'all', 'blacklist' ) || [],
[
// Nested references are
impossible
'mwReference',
'mwReferencesList',
@@ -213,7 +213,7 @@
$: this.$,
tools: ve.init.target.constructor.static.toolbarGroups,
excludeCommands:
this.constructor.static.excludeCommands,
- pasteRules: this.constructor.static.getPasteRules()
+ importRules: this.constructor.static.getImportRules()
}
);
--
To view, visit https://gerrit.wikimedia.org/r/175417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cfa15ab3efd03e2c64c2f9f725cb3098f53b32a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[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
