jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (520299e)
......................................................................
Update VE core submodule to master (520299e)
New changes:
dd15f23 Split ve.ui.Surface into DesktopSurface and MobileSurface
16283f4 Add OOjs UI's sco.json i18n file
ef94038 Split ve.ui.Context into DesktopContext and MobileContext
Minor adjustments to point to desktop and mobile Surface or Context.
Change-Id: I7cf6f99a5a1216a28a7146afcd4deb68c7eac38e
---
M .docs/categories.json
M .docs/eg-iframe.html
M VisualEditor.php
M lib/ve
A modules/ve-mw/init/styles/ve.init.mw.MobileViewTarget.css
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
7 files changed, 72 insertions(+), 5 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/categories.json b/.docs/categories.json
index ce9c729..7231f05 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -91,7 +91,11 @@
"classes": [
"ve.ui",
"ve.ui.Surface",
+ "ve.ui.DesktopSurface",
+ "ve.ui.MobileSurface",
"ve.ui.Context",
+ "ve.ui.DesktopContext",
+ "ve.ui.MobileContext",
"ve.ui.Toolbar",
"ve.ui.TargetToolbar",
"ve.ui.WindowSet",
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 0d309bd..df2b81a 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -14,7 +14,7 @@
<!-- visualEditor.core -->
<link rel=stylesheet
href="lib/ve/modules/ve/ce/styles/ve.ce.Node.css">
<link rel=stylesheet
href="lib/ve/modules/ve/ce/styles/ve.ce.Surface.css">
- <link rel=stylesheet
href="lib/ve/modules/ve/ui/styles/ve.ui.Context.css">
+ <link rel=stylesheet
href="lib/ve/modules/ve/ui/styles/ve.ui.DesktopContext.css">
<link rel=stylesheet
href="lib/ve/modules/ve/ui/styles/ve.ui.Dialog.css">
<link rel=stylesheet
href="lib/ve/modules/ve/ui/styles/ve.ui.Inspector.css">
<link rel=stylesheet
href="lib/ve/modules/ve/ui/styles/ve.ui.Surface.css">
@@ -198,7 +198,9 @@
<script
src="lib/ve/modules/ve/ce/annotations/ve.ce.TextStyleAnnotation.js"></script>
<script src="lib/ve/modules/ve/ui/ve.ui.js"></script>
<script src="lib/ve/modules/ve/ui/ve.ui.Surface.js"></script>
+ <script
src="lib/ve/modules/ve/ui/ve.ui.DesktopSurface.js"></script>
<script src="lib/ve/modules/ve/ui/ve.ui.Context.js"></script>
+ <script
src="lib/ve/modules/ve/ui/ve.ui.DesktopContext.js"></script>
<script src="lib/ve/modules/ve/ui/ve.ui.Dialog.js"></script>
<script src="lib/ve/modules/ve/ui/ve.ui.Inspector.js"></script>
<script src="lib/ve/modules/ve/ui/ve.ui.WindowSet.js"></script>
@@ -237,6 +239,10 @@
<script
src="lib/ve/modules/ve/ui/inspectors/ve.ui.LanguageInspector.js"></script>
<script
src="lib/ve/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js"></script>
+ <!-- visualEditor.mobile -->
+ <script
src="lib/ve/modules/ve/ui/ve.ui.MobileSurface.js"></script>
+ <script
src="lib/ve/modules/ve/ui/ve.ui.MobileContext.js"></script>
+
<script>ve.init.platform.setModulesUrl( 'lib/ve/modules'
);</script>
<!-- example scripts -->
diff --git a/VisualEditor.php b/VisualEditor.php
index cac13f6..126f586 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -187,6 +187,7 @@
'dependencies' => array(
'ext.visualEditor.base',
'ext.visualEditor.mediawiki',
+ 'ext.visualEditor.core.desktop',
'jquery.placeholder',
'mediawiki.feedback',
'mediawiki.jqueryMsg',
@@ -216,9 +217,13 @@
'scripts' => array(
'modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js',
),
+ 'styles' => array(
+
'modules/ve-mw/init/styles/ve.init.mw.MobileViewTarget.css',
+ ),
'dependencies' => array(
'ext.visualEditor.base',
'ext.visualEditor.mediawiki',
+ 'ext.visualEditor.core.mobile',
),
'targets' => array( 'mobile' ),
),
@@ -411,6 +416,7 @@
'lib/ve/modules/ve/ui/ve.ui.js',
'lib/ve/modules/ve/ui/ve.ui.Surface.js',
+ 'lib/ve/modules/ve/ui/ve.ui.DesktopSurface.js',
'lib/ve/modules/ve/ui/ve.ui.Context.js',
'lib/ve/modules/ve/ui/ve.ui.Dialog.js',
'lib/ve/modules/ve/ui/ve.ui.Inspector.js',
@@ -459,7 +465,6 @@
'lib/ve/modules/ve/ce/styles/ve.ce.Node.css',
'lib/ve/modules/ve/ce/styles/ve.ce.Surface.css',
// ui
- 'lib/ve/modules/ve/ui/styles/ve.ui.Context.css',
'lib/ve/modules/ve/ui/styles/ve.ui.Dialog.css',
'lib/ve/modules/ve/ui/styles/ve.ui.Inspector.css',
'lib/ve/modules/ve/ui/styles/ve.ui.Surface.css',
@@ -529,6 +534,34 @@
'targets' => array( 'desktop', 'mobile' ),
),
+ 'ext.visualEditor.core.desktop' => $wgVisualEditorResourceTemplate +
array(
+ 'scripts' => array(
+ 'lib/ve/modules/ve/ui/ve.ui.DesktopSurface.js',
+ 'lib/ve/modules/ve/ui/ve.ui.DesktopContext.js',
+ ),
+ 'styles' => array(
+ 'lib/ve/modules/ve/ui/styles/ve.ui.DesktopContext.css',
+ ),
+ 'dependencies' => array(
+ 'ext.visualEditor.core',
+ ),
+ 'targets' => array( 'desktop' ),
+ ),
+
+ 'ext.visualEditor.core.mobile' => $wgVisualEditorResourceTemplate +
array(
+ 'scripts' => array(
+ 'lib/ve/modules/ve/ui/ve.ui.MobileSurface.js',
+ 'lib/ve/modules/ve/ui/ve.ui.MobileContext.js',
+ ),
+ 'styles' => array(
+ 'lib/ve/modules/ve/ui/styles/ve.ui.MobileContext.css',
+ ),
+ 'dependencies' => array(
+ 'ext.visualEditor.core',
+ ),
+ 'targets' => array( 'mobile' ),
+ ),
+
'ext.visualEditor.mwcore' => $wgVisualEditorResourceTemplate + array(
'scripts' => array(
// dm
diff --git a/lib/ve b/lib/ve
index 07923f7..520299e 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 07923f754217c7434202991bcf85be6a838514f7
+Subproject commit 520299ed6f080a64de1536d99a5502b6321b9f52
diff --git a/modules/ve-mw/init/styles/ve.init.mw.MobileViewTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.MobileViewTarget.css
new file mode 100644
index 0000000..8d1d818
--- /dev/null
+++ b/modules/ve-mw/init/styles/ve.init.mw.MobileViewTarget.css
@@ -0,0 +1,11 @@
+/*!
+ * VisualEditor MediaWiki Initialization MobileViewTarget styles.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.ve-ui-surface-overlay-global {
+ /* enough to cover .overlay-header-container with z-index: 5 */
+ z-index: 6;
+}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index 4e751eb..0d7f763 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -40,12 +40,14 @@
/* Static Properties */
ve.init.mw.MobileViewTarget.static.toolbarGroups = [
- { 'include': [ 'bold', 'italic' ] }
+ { 'include': [ 'bold', 'italic' ] },
+ { 'include': [ 'link' ] }
];
ve.init.mw.MobileViewTarget.static.surfaceCommands = [
'bold',
- 'italic'
+ 'italic',
+ 'link'
];
ve.init.mw.MobileViewTarget.static.name = 'mobile';
@@ -61,6 +63,17 @@
};
/**
+ * Create a surface.
+ *
+ * @method
+ * @param {ve.dm.Document} dmDoc Document model
+ * @returns {ve.ui.MobileSurface}
+ */
+ve.init.mw.Target.prototype.createSurface = function ( dmDoc ) {
+ return new ve.ui.MobileSurface( dmDoc );
+};
+
+/**
* @inheritdoc
*/
ve.init.mw.MobileViewTarget.prototype.setUpToolbar = function () {
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index f144f1f..3aa9691 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1160,7 +1160,7 @@
* @returns {ve.ui.Surface}
*/
ve.init.mw.Target.prototype.createSurface = function ( dmDoc ) {
- return new ve.ui.Surface( dmDoc );
+ return new ve.ui.DesktopSurface( dmDoc );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/118749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cf6f99a5a1216a28a7146afcd4deb68c7eac38e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
