From 74358498dab50895ce06b7d0aaedfdfed973eb8e Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Sun, 31 Jan 2016 13:34:56 +0000 Subject: [PATCH] Update VE core submodule to master (70ff8cc) New changes: 242ab45 DesktopContext: Float the context when it goes beyond the viewport 405c44d Rename TableContext to TableLineContext 6c564be Sort messages alphabetically 70ff8cc Introduce table and table cell context Change-Id: I4357162bc192c90f99ca0aec12eb67bf848e5504 --- .jsduck/eg-iframe.html | 11 +++++++---- extension.json | 17 ++++++++++++----- lib/ve | 2 +- modules/ve-mw/init/ve.init.mw.Target.js | 9 --------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 79a6505a48..d82fa05d18 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -44,7 +44,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -338,19 +338,21 @@ - + - + + + @@ -392,6 +394,7 @@ + diff --git a/extension.json b/extension.json index f109506c12..f24dee620e 100644 --- a/extension.json +++ b/extension.json @@ -680,7 +680,7 @@ "lib/ve/src/ui/ve.ui.Surface.js", "lib/ve/src/ui/ve.ui.Context.js", "lib/ve/src/ui/contexts/ve.ui.LinearContext.js", - "lib/ve/src/ui/contexts/ve.ui.TableContext.js", + "lib/ve/src/ui/contexts/ve.ui.TableLineContext.js", "lib/ve/src/ui/ve.ui.ModeledFactory.js", "lib/ve/src/ui/ve.ui.ContextItem.js", "lib/ve/src/ui/ve.ui.ContextItemFactory.js", @@ -715,13 +715,15 @@ "lib/ve/src/ui/actions/ve.ui.WindowAction.js", "lib/ve/src/ui/contextitems/ve.ui.LinearContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.AnnotationContextItem.js", - "lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js", + "lib/ve/src/ui/contextitems/ve.ui.TableLineContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.AlienContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.AlignableContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.CommentContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.LanguageContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.LinkContextItem.js", "lib/ve/src/ui/contextitems/ve.ui.ToolContextItem.js", + "lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js", + "lib/ve/src/ui/contextitems/ve.ui.MergeCellsContextItem.js", "lib/ve/src/ui/commands/ve.ui.ClearAnnotationCommand.js", "lib/ve/src/ui/commands/ve.ui.HistoryCommand.js", "lib/ve/src/ui/commands/ve.ui.IndentationCommand.js", @@ -734,6 +736,7 @@ "lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js", "lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js", "lib/ve/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js", + "lib/ve/src/ui/dialogs/ve.ui.TableDialog.js", "lib/ve/src/ui/datatransferhandlers/ve.ui.PlainTextStringTransferHandler.js", "lib/ve/src/ui/datatransferhandlers/ve.ui.HTMLStringTransferHandler.js", "lib/ve/src/ui/datatransferhandlers/ve.ui.DSVFileTransferHandler.js", @@ -803,7 +806,7 @@ "lib/ve/src/ui/styles/widgets/ve.ui.TargetWidget.css", "lib/ve/src/ui/styles/ve.ui.ContextItem.css", "lib/ve/src/ui/styles/contextitems/ve.ui.LinearContextItem.css", - "lib/ve/src/ui/styles/contextitems/ve.ui.TableContextItem.css", + "lib/ve/src/ui/styles/contextitems/ve.ui.TableLineContextItem.css", "lib/ve/src/ui/styles/contextitems/ve.ui.AlignableContextItem.css", "lib/ve/src/ui/styles/contextitems/ve.ui.CommentContextItem.css", "lib/ve/src/ui/styles/contextitems/ve.ui.LanguageContextItem.css", @@ -813,7 +816,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", + "lib/ve/src/ui/styles/ve.ui.TableLineContext.css", "lib/ve/src/ui/styles/ve.ui.DebugBar.css" ], "skinStyles": { @@ -872,6 +875,8 @@ "visualeditor-dialog-command-help-title", "visualeditor-dialog-error", "visualeditor-dialog-error-dismiss", + "visualeditor-dialog-table-caption", + "visualeditor-dialog-table-title", "visualeditor-dimensionswidget-px", "visualeditor-dimensionswidget-times", "visualeditor-find-and-replace-done", @@ -926,9 +931,9 @@ "visualeditor-specialcharacter-button-tooltip", "visualeditor-specialcharacterinspector-title", "visualeditor-table-caption", + "visualeditor-table-contextitem-properties", "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", @@ -937,6 +942,8 @@ "visualeditor-table-insert-row-before", "visualeditor-table-insert-table", "visualeditor-table-merge-cells", + "visualeditor-table-merge-cells-merge", + "visualeditor-table-merge-cells-unmerge", "visualeditor-table-move-col-after", "visualeditor-table-move-col-before", "visualeditor-table-move-row-after", diff --git a/lib/ve b/lib/ve index 81fef4b62a..70ff8cc416 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 81fef4b62aa2188114ad639a71c77060b4579cd5 +Subproject commit 70ff8cc416fe0a881d185a7f6218442dcdf1ed32 diff --git a/modules/ve-mw/init/ve.init.mw.Target.js b/modules/ve-mw/init/ve.init.mw.Target.js index a3624c4de8..725b8dd6f2 100644 --- a/modules/ve-mw/init/ve.init.mw.Target.js +++ b/modules/ve-mw/init/ve.init.mw.Target.js @@ -92,15 +92,6 @@ ve.init.mw.Target.static.toolbarGroups = [ forceExpand: [ 'media', 'transclusion', 'insertTable' ], promote: [ 'media', 'transclusion', 'insertTable' ] }, - // Table - { - header: OO.ui.deferMsg( 'visualeditor-toolbar-table' ), - type: 'list', - icon: 'table', - indicator: 'down', - include: [ { group: 'table' } ], - demote: [ 'deleteTable' ] - }, // SpecialCharacter { include: [ 'specialCharacter' ] } ];