wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VE core submodule to master (e032fa161)

Browse source 
New changes:
479b50059 Localisation updates from https://translatewiki.net.
c595d8ab0 Metion task related to Firefox hack
0a160fac2 Don't trust selections from the server
d796f3db5 rebaser: Update dependencies
b097dfaad ve.dm.Transaction: Don't translate offsets inside annotate-only replacements
eadee0343 FragmentWindow: Replace previousSelection with initialFragment
561e88158 Use ve.dm.example.imgSrc everywhere
d1dceab31 DesktopContext: Remove onModelSelect event
85947ac55 Pause synchronizer while staging
9a4dd169d Catch various out-of-bounds exceptions
341114afc Remove CE HTML from DM html test fixture
5d3a673e0 ve.ce.Document test: Add src to test image
182ac338e Evalutate fragment selection after staging
e032fa161 rebaser: Drop document opacity while paused

Change-Id: Id551ee2e6510610b8f2e12cf77ce3c8429700872
This commit is contained in:
James D. Forrester 2019-12-20 11:58:09 +00:00 committed by Ed Sanders
parent 0b9d39f3cb
commit 1f74985894
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ve

@ -1 +1 @@
Subproject commit c0fbb063a3760178c46c91d3dcfd10ab880e89f4
Subproject commit e032fa161a2ce0a82a57160ddf808adc951368f1

4
modules/ve-mw/tests/dm/ve.dm.SurfaceFragment.test.js
View file

@ -37,7 +37,9 @@ QUnit.test( 'insertContent (MWheading)', function ( assert ) {
'b',
{ type: '/paragraph' },
{ type: '/listItem' },
{ type: '/list' }
{ type: '/list' },
{ type: 'internalList' },
{ type: '/internalList' }
] ),
surface = new ve.dm.Surface( doc ),
fragment = surface.getLinearFragment( new ve.Range( 4, 4 ) ),

7
modules/ve-mw/ui/inspectors/ve.ui.MWWikitextLinkAnnotationInspector.js
View file

@ -64,7 +64,7 @@ ve.ui.MWWikitextLinkAnnotationInspector.prototype.getSetupProcess = function ( d
fragment = this.getFragment();
// Only supports linear selections
if ( !( this.previousSelection instanceof ve.dm.LinearSelection ) ) {
if ( !( this.initialFragment && this.initialFragment.getSelection() instanceof ve.dm.LinearSelection ) ) {
return ve.createDeferred().reject().promise();
}
@ -175,8 +175,7 @@ ve.ui.MWWikitextLinkAnnotationInspector.prototype.getTeardownProcess = function
wgNamespaceIds = mw.config.get( 'wgNamespaceIds' ),
annotation = this.getAnnotation(),
fragment = this.getFragment(),
insertion = this.getInsertionText(),
surfaceModel = fragment.getSurface();
insertion = this.getInsertionText();
if ( data && data.action === 'done' && annotation ) {
insert = this.initialSelection.isCollapsed() && insertion.length;
@ -230,7 +229,7 @@ ve.ui.MWWikitextLinkAnnotationInspector.prototype.getTeardownProcess = function
} );
} else if ( !data.action ) {
// Restore selection to what it was before we expanded it
surfaceModel.setSelection( this.previousSelection );
this.initialFragment.select();
}
}, this )
.next( function () {