diff --git a/lib/ve b/lib/ve index 3dfcbdb3fc..87b20f9be5 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 3dfcbdb3fc2451340111b7a1e5e1c40745f03900 +Subproject commit 87b20f9be51cab869dae259f928f32a2b5c8b60b diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js index 9c0057ecda..8752a3cd9f 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js @@ -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 diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js b/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js index c970c05193..fdeed1495a 100644 --- a/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js +++ b/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js @@ -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 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js index 284a62a927..351d97c4fe 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTableDialog.js @@ -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' ),