From e68eba2687d156e1aecd3a7935365c3733b4a8bd Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Thu, 29 Jan 2015 11:02:09 -0800
Subject: [PATCH] Update VE core submodule to master (f2d7711)

New changes:
4bb50c3 Localisation updates from https://translatewiki.net.
b7a5b87 dm.InternalList: Use DOM methods instead of jQuery .html()
5b09c9b Localisation updates from https://translatewiki.net.
b709d19 Add generic support of alignable nodes
a1f6c3d Localisation updates from https://translatewiki.net.
c29675a Add find next/previous to command help dialog
1e0b1ed Localisation updates from https://translatewiki.net.
7c76542 Don't render rowspan="1" colspan="1" for every table cell
99eb069 Show a message when an invalid regex is inputted in F&R

Local changes:
Bump command help height for new find next/prev commands

Change-Id: I0196775e499132262ba80acdbf1afc26ef4e8c77
---
 .docs/eg-iframe.html                                          | 4 ++++
 VisualEditor.php                                              | 4 ++++
 lib/ve                                                        | 2 +-
 modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 2014210c8b..1ee1a7125f 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -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>
diff --git a/VisualEditor.php b/VisualEditor.php
index e1fc05b324..e042bbeda3 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -657,6 +657,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',
@@ -688,6 +691,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',
diff --git a/lib/ve b/lib/ve
index e56f537297..f2d77113cc 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit e56f5372979164c54edfb4f5941000edeb34e6d9
+Subproject commit f2d77113cce6d15e06068b48c6b1f514a899be04
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
index 46c3e3d65b..50a1af5e21 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
@@ -8,5 +8,5 @@
 	/*
 	 * See ve.ui.CommandHelpDialog.css
 	 */
-	height: 41em;
+	height: 45em;
 }