jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (f4ff1d6)
......................................................................
Update VE core submodule to master (f4ff1d6)
New changes:
d845991 Data model implementation for tables
a27c148 ContentEditable implementation for tables
3c47428 Actions and context menus for manipulating tables
543ca54 Support annotation tool on table selections
149cf3d Supporting copy paste of single table cells
25c9eee Table header/data format tools
e557e46 Merge cells tool
afcf2d9 Allow custom type and attributes when creating a table
Local changes:
Add the files and messages for table editing
Change-Id: I6e6c33b96d3089049a0fd5385191caa83df5756b
---
M .docs/categories.json
M .docs/eg-iframe.html
M VisualEditor.php
M lib/ve
M modules/ve-mw/init/ve.init.mw.Target.js
5 files changed, 37 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/categories.json b/.docs/categories.json
index 36d12e5..45859dc 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -81,7 +81,10 @@
"ve.dm.Document*",
"ve.dm.*Node",
"ve.dm.*LinearData*",
- "ve.dm.*Model"
+ "ve.dm.*Model",
+ "ve.dm.TableMatrix",
+ "ve.dm.TableMatrixCell",
+ "ve.dm.TableNodeCellIterator"
]
},
{
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index e28fd87..866be01 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -38,6 +38,7 @@
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Overlay.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Surface.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/widgets/ve.ui.SurfaceWidget.css">
+ <link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.TableContext.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Toolbar.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Icons.css">
@@ -134,11 +135,13 @@
<script src="lib/ve/src/dm/ve.dm.InternalList.js"></script>
<script src="lib/ve/src/dm/ve.dm.MetaItem.js"></script>
<script src="lib/ve/src/dm/ve.dm.MetaList.js"></script>
+ <script src="lib/ve/src/dm/ve.dm.TableMatrix.js"></script>
<script
src="lib/ve/src/dm/ve.dm.TransactionProcessor.js"></script>
<script src="lib/ve/src/dm/ve.dm.Transaction.js"></script>
<script src="lib/ve/src/dm/ve.dm.Selection.js"></script>
<script src="lib/ve/src/dm/ve.dm.LinearSelection.js"></script>
<script src="lib/ve/src/dm/ve.dm.NullSelection.js"></script>
+ <script src="lib/ve/src/dm/ve.dm.TableSelection.js"></script>
<script src="lib/ve/src/dm/ve.dm.Surface.js"></script>
<script src="lib/ve/src/dm/ve.dm.SurfaceFragment.js"></script>
<script src="lib/ve/src/dm/ve.dm.DataString.js"></script>
@@ -266,6 +269,7 @@
<script src="lib/ve/src/ui/ve.ui.Overlay.js"></script>
<script src="lib/ve/src/ui/ve.ui.Surface.js"></script>
<script src="lib/ve/src/ui/ve.ui.Context.js"></script>
+ <script src="lib/ve/src/ui/ve.ui.TableContext.js"></script>
<script src="lib/ve/src/ui/ve.ui.Tool.js"></script>
<script src="lib/ve/src/ui/ve.ui.Toolbar.js"></script>
<script src="lib/ve/src/ui/ve.ui.TargetToolbar.js"></script>
@@ -283,6 +287,7 @@
<script
src="lib/ve/src/ui/actions/ve.ui.HistoryAction.js"></script>
<script
src="lib/ve/src/ui/actions/ve.ui.IndentationAction.js"></script>
<script
src="lib/ve/src/ui/actions/ve.ui.ListAction.js"></script>
+ <script
src="lib/ve/src/ui/actions/ve.ui.TableAction.js"></script>
<script
src="lib/ve/src/ui/actions/ve.ui.WindowAction.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
@@ -307,6 +312,7 @@
<script
src="lib/ve/src/ui/tools/ve.ui.InspectorTool.js"></script>
<script
src="lib/ve/src/ui/tools/ve.ui.LanguageInspectorTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.ListTool.js"></script>
+ <script src="lib/ve/src/ui/tools/ve.ui.TableTool.js"></script>
<script
src="lib/ve/src/ui/inspectors/ve.ui.FragmentInspector.js"></script>
<script
src="lib/ve/src/ui/inspectors/ve.ui.AnnotationInspector.js"></script>
<script
src="lib/ve/src/ui/inspectors/ve.ui.NodeInspector.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index f5fc00a..40aa3da 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -358,11 +358,13 @@
'lib/ve/src/dm/ve.dm.InternalList.js',
'lib/ve/src/dm/ve.dm.MetaItem.js',
'lib/ve/src/dm/ve.dm.MetaList.js',
+ 'lib/ve/src/dm/ve.dm.TableMatrix.js',
'lib/ve/src/dm/ve.dm.TransactionProcessor.js',
'lib/ve/src/dm/ve.dm.Transaction.js',
'lib/ve/src/dm/ve.dm.Selection.js',
'lib/ve/src/dm/ve.dm.LinearSelection.js',
'lib/ve/src/dm/ve.dm.NullSelection.js',
+ 'lib/ve/src/dm/ve.dm.TableSelection.js',
'lib/ve/src/dm/ve.dm.Surface.js',
'lib/ve/src/dm/ve.dm.SurfaceFragment.js',
'lib/ve/src/dm/ve.dm.DataString.js',
@@ -499,6 +501,7 @@
'lib/ve/src/ui/ve.ui.Overlay.js',
'lib/ve/src/ui/ve.ui.Surface.js',
'lib/ve/src/ui/ve.ui.Context.js',
+ 'lib/ve/src/ui/ve.ui.TableContext.js',
'lib/ve/src/ui/ve.ui.Tool.js',
'lib/ve/src/ui/ve.ui.Toolbar.js',
'lib/ve/src/ui/ve.ui.TargetToolbar.js',
@@ -517,6 +520,7 @@
'lib/ve/src/ui/actions/ve.ui.HistoryAction.js',
'lib/ve/src/ui/actions/ve.ui.IndentationAction.js',
'lib/ve/src/ui/actions/ve.ui.ListAction.js',
+ 'lib/ve/src/ui/actions/ve.ui.TableAction.js',
'lib/ve/src/ui/actions/ve.ui.WindowAction.js',
'lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js',
@@ -539,6 +543,7 @@
'lib/ve/src/ui/tools/ve.ui.IndentationTool.js',
'lib/ve/src/ui/tools/ve.ui.InspectorTool.js',
'lib/ve/src/ui/tools/ve.ui.ListTool.js',
+ 'lib/ve/src/ui/tools/ve.ui.TableTool.js',
'lib/ve/src/ui/inspectors/ve.ui.FragmentInspector.js',
'lib/ve/src/ui/inspectors/ve.ui.AnnotationInspector.js',
@@ -581,6 +586,7 @@
'lib/ve/src/ui/styles/ve.ui.Overlay.css',
'lib/ve/src/ui/styles/ve.ui.Surface.css',
'lib/ve/src/ui/styles/ve.ui.Toolbar.css',
+ 'lib/ve/src/ui/styles/ve.ui.TableContext.css',
// TODO: add debugStyles to ResourceLoader
'lib/ve/src/ui/styles/ve.ui.DebugBar.css',
@@ -659,12 +665,24 @@
'visualeditor-specialcharacter-button-tooltip',
'visualeditor-specialcharacterinspector-title',
'visualeditor-specialcharinspector-characterlist-insert',
+ 'visualeditor-table-delete-col',
+ 'visualeditor-table-delete-row',
+ 'visualeditor-table-delete-table',
+ 'visualeditor-table-format-data',
+ 'visualeditor-table-format-header',
+ 'visualeditor-table-insert-col-after',
+ 'visualeditor-table-insert-col-before',
+ 'visualeditor-table-insert-row-after',
+ 'visualeditor-table-insert-row-before',
+ 'visualeditor-table-insert-table',
+ 'visualeditor-table-merge-cells',
'visualeditor-toolbar-format-tooltip',
'visualeditor-toolbar-history',
'visualeditor-toolbar-insert',
'visualeditor-toolbar-paragraph-format',
'visualeditor-toolbar-structure',
'visualeditor-toolbar-style-tooltip',
+ 'visualeditor-toolbar-table',
'visualeditor-toolbar-text-style',
),
'targets' => array( 'desktop', 'mobile' ),
diff --git a/lib/ve b/lib/ve
index 545d8db..f4ff1d6 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 545d8db328fe568635b001b3012ddb71b44495b1
+Subproject commit f4ff1d67fc61bd7e4f81294e459d8ff7b898c9ca
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 608bd54..91d6a52 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -230,6 +230,15 @@
include: '*',
promote: [ 'media', 'transclusion' ],
demote: [ 'specialcharacter' ]
+ },
+ // Table
+ {
+ header: OO.ui.deferMsg( 'visualeditor-toolbar-table' ),
+ type: 'list',
+ icon: 'table-insert',
+ indicator: 'down',
+ include: [ { group: 'table' } ],
+ demote: [ 'deleteTable' ]
}
];
--
To view, visit https://gerrit.wikimedia.org/r/167189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e6c33b96d3089049a0fd5385191caa83df5756b
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
