Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/134838

Change subject: Editable blockquotes in MW
......................................................................

Editable blockquotes in MW

Depends on I9507219b in core.

Bug: 51009
Change-Id: I979eee5c729e7ef190f3b846083c5d571e38571f
---
M .docs/eg-iframe.html
M VisualEditor.php
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/38/134838/1

diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index d67a171..d1d892c 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -146,6 +146,7 @@
                <script 
src="lib/ve/modules/ve/dm/lineardata/ve.dm.MetaLinearData.js"></script>
                <script 
src="lib/ve/modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js"></script>
                <script 
src="lib/ve/modules/ve/dm/nodes/ve.dm.AlienNode.js"></script>
+               <script 
src="lib/ve/modules/ve/dm/nodes/ve.dm.BlockquoteNode.js"></script>
                <script 
src="lib/ve/modules/ve/dm/nodes/ve.dm.BreakNode.js"></script>
                <script 
src="lib/ve/modules/ve/dm/nodes/ve.dm.CenterNode.js"></script>
                <script 
src="lib/ve/modules/ve/dm/nodes/ve.dm.DefinitionListItemNode.js"></script>
@@ -191,6 +192,7 @@
                <script 
src="lib/ve/modules/ve/ce/ve.ce.SurfaceObserver.js"></script>
                <script 
src="lib/ve/modules/ve/ce/nodes/ve.ce.GeneratedContentNode.js"></script>
                <script 
src="lib/ve/modules/ve/ce/nodes/ve.ce.AlienNode.js"></script>
+               <script 
src="lib/ve/modules/ve/ce/nodes/ve.ce.BlockquoteNode.js"></script>
                <script 
src="lib/ve/modules/ve/ce/nodes/ve.ce.BreakNode.js"></script>
                <script 
src="lib/ve/modules/ve/ce/nodes/ve.ce.CenterNode.js"></script>
                <script 
src="lib/ve/modules/ve/ce/nodes/ve.ce.DefinitionListItemNode.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index ab37eb8..8110228 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -336,6 +336,7 @@
 
                        
'lib/ve/modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js',
                        'lib/ve/modules/ve/dm/nodes/ve.dm.AlienNode.js',
+                       'lib/ve/modules/ve/dm/nodes/ve.dm.BlockQuoteNode.js',
                        'lib/ve/modules/ve/dm/nodes/ve.dm.BreakNode.js',
                        'lib/ve/modules/ve/dm/nodes/ve.dm.CenterNode.js',
                        
'lib/ve/modules/ve/dm/nodes/ve.dm.DefinitionListItemNode.js',
@@ -385,6 +386,7 @@
 
                        
'lib/ve/modules/ve/ce/nodes/ve.ce.GeneratedContentNode.js',
                        'lib/ve/modules/ve/ce/nodes/ve.ce.AlienNode.js',
+                       'lib/ve/modules/ve/ce/nodes/ve.ce.BlockQuoteNode.js',
                        'lib/ve/modules/ve/ce/nodes/ve.ce.BreakNode.js',
                        'lib/ve/modules/ve/ce/nodes/ve.ce.CenterNode.js',
                        
'lib/ve/modules/ve/ce/nodes/ve.ce.DefinitionListItemNode.js',
@@ -528,6 +530,7 @@
                        'visualeditor-dialog-media-size-originalsize-error',
                        'visualeditor-dimensionswidget-px',
                        'visualeditor-dimensionswidget-times',
+                       'visualeditor-formatdropdown-format-blockquote',
                        'visualeditor-formatdropdown-format-heading-label',
                        'visualeditor-formatdropdown-format-heading1',
                        'visualeditor-formatdropdown-format-heading2',
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 102860a..dc10d00 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -193,7 +193,7 @@
                'title': OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip' 
),
                'include': [ { 'group': 'format' } ],
                'promote': [ 'paragraph' ],
-               'demote': [ 'preformatted', 'heading1' ]
+               'demote': [ 'preformatted', 'blockquote', 'heading1' ]
        },
        // Style
        {

-- 
To view, visit https://gerrit.wikimedia.org/r/134838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I979eee5c729e7ef190f3b846083c5d571e38571f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to