wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 02:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VE core submodule to master (a65ad7c)

Browse source 
New changes:
a65ad7c Move special character inserter to toolbar dialog manager

… and add it to the toolbar as a terminal option.

Change-Id: I35834d866a13c5dea7f5a520c63b8a99451fcf6d
This commit is contained in:
Ed Sanders 2015-02-03 11:06:18 -08:00 committed by James D. Forrester
parent 13945462ce
commit 94fe054257
6 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.docs/categories.json
View file

@ -128,6 +128,7 @@
"ve.ui.*Command",
"ve.ui.*ContextItem",
"ve.ui.*Factory",
"ve.ui.*Page",
"ve.ui.*Registry",
"ve.ui.*Sequence",
"ve.ui.*Tool",

5
.docs/eg-iframe.html
View file

@ -24,6 +24,7 @@
<link rel=stylesheet href="lib/ve/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/dialogs/ve.ui.FindAndReplaceDialog.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/dialogs/ve.ui.ProgressDialog.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/tools/ve.ui.FormatTool.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/widgets/ve.ui.LanguageInputWidget.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/widgets/ve.ui.LanguageSearchWidget.css" class="stylesheet-ve">
@ -34,7 +35,6 @@
<link rel=stylesheet href="lib/ve/src/ui/styles/inspectors/ve.ui.CommentInspector.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/inspectors/ve.ui.FragmentInspector.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/inspectors/ve.ui.LinkInspector.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/inspectors/ve.ui.SpecialCharacterInspector.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/ve.ui.ContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.CommentContextItem.css" class="stylesheet-ve">
<link rel=stylesheet href="lib/ve/src/ui/styles/contextitems/ve.ui.LanguageContextItem.css" class="stylesheet-ve">
@ -337,6 +337,7 @@
<script src="lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js"></script>
<script src="lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js"></script>
<script src="lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js"></script>
<script src="lib/ve/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js"></script>
<script src="lib/ve/src/ui/datatransferhandlers/ve.ui.HTMLStringTransferHandler.js"></script>
<script src="lib/ve/src/ui/datatransferhandlers/ve.ui.PlainTextStringTransferHandler.js"></script>
<script src="lib/ve/src/ui/datatransferhandlers/ve.ui.DSVFileTransferHandler.js"></script>
@ -372,7 +373,7 @@
<script src="lib/ve/src/ui/inspectors/ve.ui.LinkInspector.js"></script>
<script src="lib/ve/src/ui/inspectors/ve.ui.CommentInspector.js"></script>
<script src="lib/ve/src/ui/inspectors/ve.ui.LanguageInspector.js"></script>
<script src="lib/ve/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js"></script>
<script src="lib/ve/src/ui/pages/ve.ui.SpecialCharacterPage.js"></script>
<!-- visualEditor.desktop.build -->
<script src="lib/ve/src/ui/ve.ui.DesktopSurface.js"></script>

5
VisualEditor.php
View file

@ -577,6 +577,7 @@ $wgResourceModules += array(
'lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js',
'lib/ve/src/ui/datatransferhandlers/ve.ui.PlainTextStringTransferHandler.js',
'lib/ve/src/ui/datatransferhandlers/ve.ui.HTMLStringTransferHandler.js',
@ -612,7 +613,7 @@ $wgResourceModules += array(
'lib/ve/src/ui/inspectors/ve.ui.CommentInspector.js',
'lib/ve/src/ui/inspectors/ve.ui.LinkInspector.js',
'lib/ve/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js',
'lib/ve/src/ui/pages/ve.ui.SpecialCharacterPage.js',
),
'debugScripts' => array(
'lib/ve/src/ui/ve.ui.DebugBar.js',
@ -637,6 +638,7 @@ $wgResourceModules += array(
'lib/ve/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css',
'lib/ve/src/ui/styles/dialogs/ve.ui.FindAndReplaceDialog.css',
'lib/ve/src/ui/styles/dialogs/ve.ui.ProgressDialog.css',
'lib/ve/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css',
'lib/ve/src/ui/styles/tools/ve.ui.FormatTool.css',
'lib/ve/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css',
'lib/ve/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css',
@ -645,7 +647,6 @@ $wgResourceModules += array(
'lib/ve/src/ui/styles/inspectors/ve.ui.CommentInspector.css',
'lib/ve/src/ui/styles/inspectors/ve.ui.FragmentInspector.css',
'lib/ve/src/ui/styles/inspectors/ve.ui.LinkInspector.css',
'lib/ve/src/ui/styles/inspectors/ve.ui.SpecialCharacterInspector.css',
'lib/ve/src/ui/styles/widgets/ve.ui.SurfaceWidget.css',
'lib/ve/src/ui/styles/ve.ui.ContextItem.css',
'lib/ve/src/ui/styles/contextitems/ve.ui.CommentContextItem.css',

5
extension.json
View file

@ -642,6 +642,7 @@
"lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js",
"lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js",
"lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js",
"lib/ve/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js",
"lib/ve/src/ui/datatransferhandlers/ve.ui.PlainTextStringTransferHandler.js",
"lib/ve/src/ui/datatransferhandlers/ve.ui.HTMLStringTransferHandler.js",
"lib/ve/src/ui/datatransferhandlers/ve.ui.DSVFileTransferHandler.js",
@ -671,7 +672,7 @@
"lib/ve/src/ui/inspectors/ve.ui.NodeInspector.js",
"lib/ve/src/ui/inspectors/ve.ui.CommentInspector.js",
"lib/ve/src/ui/inspectors/ve.ui.LinkInspector.js",
"lib/ve/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js"
"lib/ve/src/ui/pages/ve.ui.SpecialCharacterPage.js"
],
"debugScripts": [
"lib/ve/src/ui/ve.ui.DebugBar.js",
@ -693,6 +694,7 @@
"lib/ve/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css",
"lib/ve/src/ui/styles/dialogs/ve.ui.FindAndReplaceDialog.css",
"lib/ve/src/ui/styles/dialogs/ve.ui.ProgressDialog.css",
"lib/ve/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css",
"lib/ve/src/ui/styles/tools/ve.ui.FormatTool.css",
"lib/ve/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css",
"lib/ve/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css",
@ -701,7 +703,6 @@
"lib/ve/src/ui/styles/inspectors/ve.ui.CommentInspector.css",
"lib/ve/src/ui/styles/inspectors/ve.ui.FragmentInspector.css",
"lib/ve/src/ui/styles/inspectors/ve.ui.LinkInspector.css",
"lib/ve/src/ui/styles/inspectors/ve.ui.SpecialCharacterInspector.css",
"lib/ve/src/ui/styles/widgets/ve.ui.SurfaceWidget.css",
"lib/ve/src/ui/styles/ve.ui.ContextItem.css",
"lib/ve/src/ui/styles/contextitems/ve.ui.CommentContextItem.css",

2
lib/ve

@ -1 +1 @@
Subproject commit b90965cd6374567574f88cc5407fbca5a8d144cc
Subproject commit a65ad7c55e8fc710aaf24fab36a0302ac1fc5b71

7
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -229,8 +229,7 @@ ve.init.mw.Target.static.toolbarGroups = [
indicator: 'down',
include: '*',
forceExpand: [ 'media', 'transclusion', 'insertTable' ],
promote: [ 'media', 'transclusion' ],
demote: [ 'specialcharacter' ]
promote: [ 'media', 'transclusion' ]
},
// Table
{
@ -240,7 +239,9 @@ ve.init.mw.Target.static.toolbarGroups = [
indicator: 'down',
include: [ { group: 'table' } ],
demote: [ 'deleteTable' ]
}
},
// SpecialCharacter
{ include: [ 'specialCharacter' ] }
];
ve.init.mw.Target.static.importRules = {