Merge "Update VE core submodule to master (f2d7711)"

This commit is contained in:
jenkins-bot 2015-01-31 00:59:28 +00:00 committed by Gerrit Code Review
commit 7ff36511e4
4 changed files with 10 additions and 2 deletions

View file

@ -18,6 +18,7 @@
<link rel=stylesheet href="lib/ve/src/ce/styles/nodes/ve.ce.DocumentNode.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/nodes/ve.ce.GeneratedContentNode.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/annotations/ve.ce.LanguageAnnotation.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/nodes/ve.ce.AlignableNode.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/nodes/ve.ce.ResizableNode.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/nodes/ve.ce.TableCellNode.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/nodes/ve.ce.TableNode.css">
@ -141,6 +142,7 @@
<script src="lib/ve/src/dm/ve.dm.AnnotationSet.js"></script>
<script src="lib/ve/src/dm/ve.dm.MetaItemFactory.js"></script>
<script src="lib/ve/src/dm/ve.dm.ClassAttributeNode.js"></script>
<script src="lib/ve/src/dm/ve.dm.AlignableNode.js"></script>
<script src="lib/ve/src/dm/ve.dm.FocusableNode.js"></script>
<script src="lib/ve/src/dm/ve.dm.Scalable.js"></script>
<script src="lib/ve/src/dm/ve.dm.ResizableNode.js"></script>
@ -231,6 +233,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.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>
<script src="lib/ve/src/ce/ve.ce.Surface.js"></script>
@ -326,6 +329,7 @@
<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/windowmanagers/ve.ui.ToolbarDialogWindowManager.js"></script>
<script src="lib/ve/src/ui/widgets/ve.ui.AlignWidget.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>

View file

@ -658,6 +658,9 @@ $wgResourceModules += array(
'messages' => array(
'visualeditor',
'visualeditor-aliennode-tooltip',
'visualeditor-align-widget-center',
'visualeditor-align-widget-left',
'visualeditor-align-widget-right',
'visualeditor-annotationbutton-bold-tooltip',
'visualeditor-annotationbutton-code-tooltip',
'visualeditor-annotationbutton-italic-tooltip',
@ -689,6 +692,7 @@ $wgResourceModules += array(
'visualeditor-dimensionswidget-times',
'visualeditor-find-and-replace-done',
'visualeditor-find-and-replace-find-text',
'visualeditor-find-and-replace-invalid-regex',
'visualeditor-find-and-replace-match-case',
'visualeditor-find-and-replace-next-button',
'visualeditor-find-and-replace-previous-button',

2
lib/ve

@ -1 +1 @@
Subproject commit e56f5372979164c54edfb4f5941000edeb34e6d9
Subproject commit f2d77113cce6d15e06068b48c6b1f514a899be04

View file

@ -8,5 +8,5 @@
/*
* See ve.ui.CommandHelpDialog.css
*/
height: 41em;
height: 45em;
}