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

Revert "Update VE core submodule to master (02f5f0ca4)"

Browse source 
This reverts commit be628a5b7e.

87b20f9b Revert "[BREAKING CHANGE] Do not cache document model data in DM selections"

Change-Id: I47bbf757a4ad227346d3734f6e50d928a2de1409
This commit is contained in:
James D. Forrester 2018-10-30 15:04:05 -07:00
parent 3e26043a33
commit c36f3d2214
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ve

@ -1 +1 @@
Subproject commit 3dfcbdb3fc2451340111b7a1e5e1c40745f03900
Subproject commit 87b20f9be51cab869dae259f928f32a2b5c8b60b

4
modules/ve-mw/dm/models/ve.dm.MWImageModel.js
View file

@ -467,7 +467,7 @@ ve.dm.MWImageModel.prototype.insertImageNode = function ( fragment ) {
offset = fragment.getDocument().data.getNearestContentOffset( fragment.getSelection().getRange().start );
}
if ( offset > -1 ) {
fragment = fragment.clone( new ve.dm.LinearSelection( new ve.Range( offset ) ) );
fragment = fragment.clone( new ve.dm.LinearSelection( fragment.getDocument(), new ve.Range( offset ) ) );
}
fragment.insertContent( contentToInsert );
return fragment;
@ -476,7 +476,7 @@ ve.dm.MWImageModel.prototype.insertImageNode = function ( fragment ) {
// Try to put the image in front of the structural node
offset = fragment.getDocument().data.getNearestStructuralOffset( fragment.getSelection().getRange().start, -1 );
if ( offset > -1 ) {
fragment = fragment.clone( new ve.dm.LinearSelection( new ve.Range( offset ) ) );
fragment = fragment.clone( new ve.dm.LinearSelection( fragment.getDocument(), new ve.Range( offset ) ) );
}
fragment.insertContent( contentToInsert );
// Add contents of new caption

4
modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js
View file

@ -82,9 +82,7 @@ ve.ui.MWTransclusionContextItem.prototype.onEditButtonClick = function () {
selection = surfaceModel.getSelection();
if ( selection instanceof ve.dm.TableSelection ) {
surfaceModel.setLinearSelection( selection.getOuterRanges(
surfaceModel.getDocument()
)[ 0 ] );
surfaceModel.setLinearSelection( selection.getOuterRanges()[ 0 ] );
}
// Parent method

4
modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js
View file

@ -84,9 +84,7 @@ ve.ui.MWTableDialog.prototype.initialize = function () {
ve.ui.MWTableDialog.prototype.getSetupProcess = function ( data ) {
return ve.ui.MWTableDialog.super.prototype.getSetupProcess.call( this, data )
.next( function () {
var tableNode = this.getFragment().getSelection().getTableNode(
this.getFragment().getDocument()
),
var tableNode = this.getFragment().getSelection().getTableNode(),
wikitable = !!tableNode.getAttribute( 'wikitable' ),
sortable = !!tableNode.getAttribute( 'sortable' ),
collapsible = !!tableNode.getAttribute( 'collapsible' ),