Merge "Update VE core submodule to master (4408c13)"

This commit is contained in:
jenkins-bot 2016-08-05 20:50:16 +00:00 committed by Gerrit Code Review
commit 557ffff7ee
3 changed files with 4 additions and 2 deletions

View file

@ -894,10 +894,12 @@
"visualeditor-align-widget-left",
"visualeditor-align-widget-right",
"visualeditor-alignablecontextitem-title",
"visualeditor-annotationbutton-big-tooltip",
"visualeditor-annotationbutton-bold-tooltip",
"visualeditor-annotationbutton-code-tooltip",
"visualeditor-annotationbutton-italic-tooltip",
"visualeditor-annotationbutton-link-tooltip",
"visualeditor-annotationbutton-small-tooltip",
"visualeditor-annotationbutton-strikethrough-tooltip",
"visualeditor-annotationbutton-subscript-tooltip",
"visualeditor-annotationbutton-superscript-tooltip",

2
lib/ve

@ -1 +1 @@
Subproject commit 2567ca9296b358a67aa1a002622cd38876a9e98d
Subproject commit 4408c13850e3ee9583f51d0b3c306721b988103f

View file

@ -66,7 +66,7 @@ ve.init.mw.Target.static.toolbarGroups = [
include: [ { group: 'textStyle' }, 'language', 'clear' ],
forceExpand: [ 'bold', 'italic', 'clear' ],
promote: [ 'bold', 'italic' ],
demote: [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
demote: [ 'strikethrough', 'code', 'underline', 'language', 'big', 'small', 'clear' ]
},
// Link
{ include: [ 'link' ] },