Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130820
Change subject: Use correct fragment in windows
......................................................................
Use correct fragment in windows
In two cases we were using fragment.getSurface().getFragment() which
creates a new fragment from the current selection instead of using
the range of the original fragment.
Change-Id: Ib41efe2ceb670a125c0c306d143e56f9b9c349e7
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
2 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/20/130820/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 6faf447..769deb8 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -584,13 +584,14 @@
var newDoc, doc, originalAlt, attr, transactionAttributes = {},
imageSizeType, imageType, imageAlignmentCheckbox,
imageAlignmentValue, originalDimensions,
- surfaceModel = this.getFragment().getSurface();
+ fragment = this.getFragment(),
+ surfaceModel = fragment.getSurface();
newDoc = this.captionSurface.getSurface().getModel().getDocument();
doc = surfaceModel.getDocument();
if ( !this.captionNode ) {
// Insert a new caption at the beginning of the image node
- surfaceModel.getFragment()
+ fragment
.adjustRange( 1 )
.collapseRangeToStart()
.insertContent( [ { 'type': 'mwImageCaption' }, {
'type': '/mwImageCaption' } ] );
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
index fd22b0b..f2228fe 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
@@ -119,7 +119,8 @@
*/
ve.ui.MWExtensionInspector.prototype.teardown = function ( data ) {
var mwData,
- surfaceModel = this.getFragment().getSurface();
+ fragment = this.getFragment(),
+ surfaceModel = fragment.getSurface();
if ( this.constructor.static.allowedEmpty || this.input.getValue() !==
'' ) {
if ( this.node ) {
@@ -137,7 +138,7 @@
'body': {}
};
this.updateMwData( mwData );
-
surfaceModel.getFragment().collapseRangeToEnd().insertContent( [
+ fragment.collapseRangeToEnd().insertContent( [
{
'type':
this.constructor.static.nodeModel.static.name,
'attributes': {
@@ -150,7 +151,7 @@
} else if ( this.node && !this.constructor.static.allowedEmpty ) {
// Content has been emptied on a node which isn't allowed to
// be empty, so delete it.
- surfaceModel.getFragment().removeContent();
+ fragment.removeContent();
}
// Parent method
--
To view, visit https://gerrit.wikimedia.org/r/130820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib41efe2ceb670a125c0c306d143e56f9b9c349e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
