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
This commit is contained in:
Ed Sanders 2016-01-31 13:34:56 +00:00 committed by James D. Forrester
parent 5e296a959b
commit 74358498da
4 changed files with 20 additions and 19 deletions

View file

@ -44,7 +44,7 @@
<link rel=stylesheet href="lib/ve/src/ui/styles/inspectors/ve.ui.FragmentInspector.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.ContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.LinearContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.TableContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.TableLineContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.AlignableContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.CommentContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.LanguageContextItem.css" class="stylesheet-ve">
@ -54,7 +54,7 @@
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.Overlay.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.Surface.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/widgets/ve.ui.TargetWidget.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.TableContext.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.TableLineContext.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.Toolbar.css" class="stylesheet-ve">
<!-- visualEditor.desktop.build -->
@ -338,19 +338,21 @@
<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/contexts/ve.ui.LinearContext.js"></script>
<script src="lib/ve/src/ui/contexts/ve.ui.TableContext.js"></script>
<script src="lib/ve/src/ui/contexts/ve.ui.TableLineContext.js"></script>
<script src="lib/ve/src/ui/ve.ui.ModeledFactory.js"></script>
<script src="lib/ve/src/ui/ve.ui.ContextItem.js"></script>
<script src="lib/ve/src/ui/ve.ui.ContextItemFactory.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.LinearContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.AnnotationContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.TableLineContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.AlienContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.AlignableContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.CommentContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.LanguageContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.LinkContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.ToolContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js"></script>
<script src="lib/ve/src/ui/contextitems/ve.ui.MergeCellsContextItem.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>
@ -392,6 +394,7 @@
<script src="lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js"></script>
<script src="lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js"></script>
<script src="lib/ve/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js"></script>
<script src="lib/ve/src/ui/dialogs/ve.ui.TableDialog.js"></script>
<script src="lib/ve/src/ui/datatransferhandlers/ve.ui.HTMLStringTransferHandler.js"></script>
<script src="lib/ve/src/ui/datatransferhandlers/ve.ui.PlainTextStringTransferHandler.js"></script>
<script src="lib/ve/src/ui/datatransferhandlers/ve.ui.DSVFileTransferHandler.js"></script>

View file

@ -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",

2
lib/ve

@ -1 +1 @@
Subproject commit 81fef4b62aa2188114ad639a71c77060b4579cd5
Subproject commit 70ff8cc416fe0a881d185a7f6218442dcdf1ed32

View file

@ -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' ] }
];