Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68223
Change subject: Media display and insertion no longer an experimental feature
......................................................................
Media display and insertion no longer an experimental feature
Media item dialog for settings; drag-and-drop placement; caption
editing still to come.
Bug: 37870
Change-Id: I547e06dcdb92e19f0159660314187c4f1a62f3ed
---
M VisualEditor.php
M demos/ve/index.php
M modules/ve/test/index.php
3 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/23/68223/1
diff --git a/VisualEditor.php b/VisualEditor.php
index 20c21a3..6542e0e 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -276,6 +276,9 @@
've/dm/nodes/ve.dm.MWEntityNode.js',
've/dm/nodes/ve.dm.MWHeadingNode.js',
've/dm/nodes/ve.dm.MWPreformattedNode.js',
+ 've/dm/nodes/ve.dm.MWInlineImageNode.js',
+ 've/dm/nodes/ve.dm.MWBlockImageNode.js',
+ 've/dm/nodes/ve.dm.MWImageCaptionNode.js',
've/dm/annotations/ve.dm.LinkAnnotation.js',
've/dm/annotations/ve.dm.MWExternalLinkAnnotation.js',
@@ -333,6 +336,9 @@
've/ce/nodes/ve.ce.MWEntityNode.js',
've/ce/nodes/ve.ce.MWHeadingNode.js',
've/ce/nodes/ve.ce.MWPreformattedNode.js',
+ 've/ce/nodes/ve.ce.MWInlineImageNode.js',
+ 've/ce/nodes/ve.ce.MWBlockImageNode.js',
+ 've/ce/nodes/ve.ce.MWImageCaptionNode.js',
've/ce/annotations/ve.ce.LinkAnnotation.js',
've/ce/annotations/ve.ce.MWExternalLinkAnnotation.js',
@@ -395,6 +401,8 @@
've/ui/widgets/ve.ui.MWCategoryPopupWidget.js',
've/ui/widgets/ve.ui.MWCategoryItemWidget.js',
've/ui/widgets/ve.ui.MWCategoryWidget.js',
+ 've/ui/widgets/ve.ui.MWMediaSelectWidget.js',
+ 've/ui/widgets/ve.ui.MWMediaSelectItemWidget.js',
've/ui/layouts/ve.ui.FieldsetLayout.js',
've/ui/layouts/ve.ui.GridLayout.js',
@@ -403,6 +411,7 @@
've/ui/dialogs/ve.ui.PagedDialog.js',
've/ui/dialogs/ve.ui.MWMetaDialog.js',
+ 've/ui/dialogs/ve.ui.MWMediaInsertDialog.js',
've/ui/tools/ve.ui.ButtonTool.js',
've/ui/tools/ve.ui.AnnotationButtonTool.js',
@@ -417,6 +426,7 @@
've/ui/tools/buttons/ve.ui.ClearButtonTool.js',
've/ui/tools/buttons/ve.ui.LinkButtonTool.js',
've/ui/tools/buttons/ve.ui.MWLinkButtonTool.js',
+ 've/ui/tools/buttons/ve.ui.MWMediaInsertButtonTool.js',
've/ui/tools/buttons/ve.ui.BulletButtonTool.js',
've/ui/tools/buttons/ve.ui.NumberButtonTool.js',
've/ui/tools/buttons/ve.ui.IndentButtonTool.js',
@@ -470,6 +480,9 @@
'visualeditor-dialog-action-apply',
'visualeditor-dialog-action-cancel',
'visualeditor-dialog-action-close',
+ 'visualeditor-dialog-media-insert-button',
+ 'visualeditor-dialog-media-insert-title',
+ 'visualeditor-dialog-media-title',
'visualeditor-dialog-meta-categories-data-label',
'visualeditor-dialog-meta-categories-defaultsort-label',
'visualeditor-dialog-meta-categories-input-matchingcategorieslabel',
@@ -485,6 +498,7 @@
'visualeditor-dialog-meta-languages-readonlynote',
'visualeditor-dialog-meta-languages-section',
'visualeditor-dialog-meta-title',
+ 'visualeditor-dialogbutton-media-tooltip',
'visualeditor-dialogbutton-meta-tooltip',
'visualeditor-diff-nochanges',
'visualeditor-differror',
@@ -514,6 +528,7 @@
'visualeditor-linkinspector-title',
'visualeditor-listbutton-bullet-tooltip',
'visualeditor-listbutton-number-tooltip',
+ 'visualeditor-media-input-placeholder',
'visualeditor-meta-tool',
'visualeditor-notification-created',
'visualeditor-notification-restored',
@@ -539,26 +554,16 @@
),
'ext.visualEditor.experimental' => $wgVisualEditorResourceTemplate +
array(
'scripts' => array(
- 've/dm/nodes/ve.dm.MWInlineImageNode.js',
- 've/dm/nodes/ve.dm.MWBlockImageNode.js',
- 've/dm/nodes/ve.dm.MWImageCaptionNode.js',
've/dm/nodes/ve.dm.MWTemplateNode.js',
've/dm/nodes/ve.dm.MWReferenceListNode.js',
've/dm/nodes/ve.dm.MWReferenceNode.js',
- 've/ce/nodes/ve.ce.MWInlineImageNode.js',
- 've/ce/nodes/ve.ce.MWBlockImageNode.js',
- 've/ce/nodes/ve.ce.MWImageCaptionNode.js',
've/ce/nodes/ve.ce.MWTemplateNode.js',
've/ce/nodes/ve.ce.MWReferenceListNode.js',
've/ce/nodes/ve.ce.MWReferenceNode.js',
- 've/ui/dialogs/ve.ui.MWMediaInsertDialog.js',
- 've/ui/widgets/ve.ui.MWMediaSelectWidget.js',
- 've/ui/widgets/ve.ui.MWMediaSelectItemWidget.js',
've/ui/tools/buttons/ve.ui.MWReferenceButtonTool.js',
've/ui/tools/buttons/ve.ui.MWTemplateButtonTool.js',
- 've/ui/tools/buttons/ve.ui.MWMediaInsertButtonTool.js',
've/ui/dialogs/ve.ui.MWReferenceDialog.js',
've/ui/dialogs/ve.ui.MWTemplateDialog.js',
),
@@ -567,15 +572,10 @@
),
'messages' => array(
// VE messages needed by code that is only in
experimental mode
- 'visualeditor-dialog-media-insert-button',
- 'visualeditor-dialog-media-insert-title',
- 'visualeditor-dialog-media-title',
'visualeditor-dialog-reference-title',
'visualeditor-dialog-template-title',
- 'visualeditor-dialogbutton-media-tooltip',
'visualeditor-dialogbutton-reference-tooltip',
'visualeditor-dialogbutton-template-tooltip',
- 'visualeditor-media-input-placeholder',
),
),
'ext.visualEditor.icons-raster' => $wgVisualEditorResourceTemplate +
array(
diff --git a/demos/ve/index.php b/demos/ve/index.php
index e96806d..78f69b9 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -166,6 +166,9 @@
<script
src="../../modules/ve/dm/nodes/ve.dm.MWEntityNode.js"></script>
<script
src="../../modules/ve/dm/nodes/ve.dm.MWHeadingNode.js"></script>
<script
src="../../modules/ve/dm/nodes/ve.dm.MWPreformattedNode.js"></script>
+ <script
src="../../modules/ve/dm/nodes/ve.dm.MWInlineImageNode.js"></script>
+ <script
src="../../modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js"></script>
+ <script
src="../../modules/ve/dm/nodes/ve.dm.MWImageCaptionNode.js"></script>
<script
src="../../modules/ve/dm/annotations/ve.dm.LinkAnnotation.js"></script>
<script
src="../../modules/ve/dm/annotations/ve.dm.MWExternalLinkAnnotation.js"></script>
<script
src="../../modules/ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js"></script>
@@ -217,6 +220,9 @@
<script
src="../../modules/ve/ce/nodes/ve.ce.MWEntityNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWHeadingNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWPreformattedNode.js"></script>
+ <script
src="../../modules/ve/ce/nodes/ve.ce.MWInlineImageNode.js"></script>
+ <script
src="../../modules/ve/ce/nodes/ve.ce.MWBlockImageNode.js"></script>
+ <script
src="../../modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js"></script>
<script
src="../../modules/ve/ce/annotations/ve.ce.LinkAnnotation.js"></script>
<script
src="../../modules/ve/ce/annotations/ve.ce.MWExternalLinkAnnotation.js"></script>
<script
src="../../modules/ve/ce/annotations/ve.ce.MWInternalLinkAnnotation.js"></script>
@@ -302,15 +308,9 @@
<script
src="../../modules/ve/ui/inspectors/ve.ui.LinkInspector.js"></script>
<script
src="../../modules/ve/ui/inspectors/ve.ui.MWLinkInspector.js"></script>
<!-- ext.visualEditor.experimental -->
- <script
src="../../modules/ve/dm/nodes/ve.dm.MWInlineImageNode.js"></script>
- <script
src="../../modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js"></script>
- <script
src="../../modules/ve/dm/nodes/ve.dm.MWImageCaptionNode.js"></script>
<script
src="../../modules/ve/dm/nodes/ve.dm.MWTemplateNode.js"></script>
<script
src="../../modules/ve/dm/nodes/ve.dm.MWReferenceListNode.js"></script>
<script
src="../../modules/ve/dm/nodes/ve.dm.MWReferenceNode.js"></script>
- <script
src="../../modules/ve/ce/nodes/ve.ce.MWInlineImageNode.js"></script>
- <script
src="../../modules/ve/ce/nodes/ve.ce.MWBlockImageNode.js"></script>
- <script
src="../../modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWTemplateNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWReferenceListNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWReferenceNode.js"></script>
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index bd161bd..bfaac3b 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -119,6 +119,9 @@
<script src="../../ve/dm/nodes/ve.dm.MWEntityNode.js"></script>
<script src="../../ve/dm/nodes/ve.dm.MWHeadingNode.js"></script>
<script
src="../../ve/dm/nodes/ve.dm.MWPreformattedNode.js"></script>
+ <script
src="../../ve/dm/nodes/ve.dm.MWInlineImageNode.js"></script>
+ <script
src="../../ve/dm/nodes/ve.dm.MWBlockImageNode.js"></script>
+ <script
src="../../ve/dm/nodes/ve.dm.MWImageCaptionNode.js"></script>
<script
src="../../ve/dm/annotations/ve.dm.LinkAnnotation.js"></script>
<script
src="../../ve/dm/annotations/ve.dm.MWExternalLinkAnnotation.js"></script>
<script
src="../../ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js"></script>
@@ -170,6 +173,9 @@
<script src="../../ve/ce/nodes/ve.ce.MWEntityNode.js"></script>
<script src="../../ve/ce/nodes/ve.ce.MWHeadingNode.js"></script>
<script
src="../../ve/ce/nodes/ve.ce.MWPreformattedNode.js"></script>
+ <script
src="../../ve/ce/nodes/ve.ce.MWInlineImageNode.js"></script>
+ <script
src="../../ve/ce/nodes/ve.ce.MWBlockImageNode.js"></script>
+ <script
src="../../ve/ce/nodes/ve.ce.MWImageCaptionNode.js"></script>
<script
src="../../ve/ce/annotations/ve.ce.LinkAnnotation.js"></script>
<script
src="../../ve/ce/annotations/ve.ce.MWExternalLinkAnnotation.js"></script>
<script
src="../../ve/ce/annotations/ve.ce.MWInternalLinkAnnotation.js"></script>
@@ -255,15 +261,9 @@
<script
src="../../ve/ui/inspectors/ve.ui.LinkInspector.js"></script>
<script
src="../../ve/ui/inspectors/ve.ui.MWLinkInspector.js"></script>
<!-- ext.visualEditor.experimental -->
- <script
src="../../ve/dm/nodes/ve.dm.MWInlineImageNode.js"></script>
- <script
src="../../ve/dm/nodes/ve.dm.MWBlockImageNode.js"></script>
- <script
src="../../ve/dm/nodes/ve.dm.MWImageCaptionNode.js"></script>
<script
src="../../ve/dm/nodes/ve.dm.MWTemplateNode.js"></script>
<script
src="../../ve/dm/nodes/ve.dm.MWReferenceListNode.js"></script>
<script
src="../../ve/dm/nodes/ve.dm.MWReferenceNode.js"></script>
- <script
src="../../ve/ce/nodes/ve.ce.MWInlineImageNode.js"></script>
- <script
src="../../ve/ce/nodes/ve.ce.MWBlockImageNode.js"></script>
- <script
src="../../ve/ce/nodes/ve.ce.MWImageCaptionNode.js"></script>
<script
src="../../ve/ce/nodes/ve.ce.MWTemplateNode.js"></script>
<script
src="../../ve/ce/nodes/ve.ce.MWReferenceListNode.js"></script>
<script
src="../../ve/ce/nodes/ve.ce.MWReferenceNode.js"></script>
--
To view, visit https://gerrit.wikimedia.org/r/68223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I547e06dcdb92e19f0159660314187c4f1a62f3ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
