jenkins-bot has submitted this change and it was merged.
Change subject: MWMediaDialog: Remove redundant check of this.imageModel
existence
......................................................................
MWMediaDialog: Remove redundant check of this.imageModel existence
The fact it has to exist for the two previous statements to
not fatal is a bit of a clue. I assume this made sense at
some point in the past.
Change-Id: Ic9c04395408301f514ff7e9a224b8e2c30d64896
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
1 file changed, 22 insertions(+), 25 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 54a0b29..ad13688 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -1244,33 +1244,30 @@
this.captionTarget.getSurface().getModel().getDocument()
);
- // TODO: Simplify this condition
- if ( this.imageModel ) {
- if (
- // There was an initial node
- this.selectedNode &&
- // And we didn't change the
image type block/inline or vise versa
- this.selectedNode.type ===
this.imageModel.getImageNodeType() &&
- // And we didn't change the
image itself
- this.selectedNode.getAttribute(
'src' ) ===
-
this.imageModel.getImageSource()
- ) {
- // We only need to update the
attributes of the current node
-
this.imageModel.updateImageNode( this.selectedNode, surfaceModel );
- } else {
- // Replacing an image or
inserting a brand new one
+ if (
+ // There was an initial node
+ this.selectedNode &&
+ // And we didn't change the image type
block/inline or vise versa
+ this.selectedNode.type ===
this.imageModel.getImageNodeType() &&
+ // And we didn't change the image itself
+ this.selectedNode.getAttribute( 'src' )
===
+ this.imageModel.getImageSource()
+ ) {
+ // We only need to update the
attributes of the current node
+ this.imageModel.updateImageNode(
this.selectedNode, surfaceModel );
+ } else {
+ // Replacing an image or inserting a
brand new one
- // If there was a previous
node, remove it first
- if ( this.selectedNode ) {
- // Remove the old image
- this.fragment =
this.getFragment().clone(
- new
ve.dm.LinearSelection( this.fragment.getDocument(),
this.selectedNode.getOuterRange() )
- );
-
this.fragment.removeContent();
- }
- // Insert the new image
- this.fragment =
this.imageModel.insertImageNode( this.getFragment() );
+ // If there was a previous node, remove
it first
+ if ( this.selectedNode ) {
+ // Remove the old image
+ this.fragment =
this.getFragment().clone(
+ new
ve.dm.LinearSelection( this.fragment.getDocument(),
this.selectedNode.getOuterRange() )
+ );
+ this.fragment.removeContent();
}
+ // Insert the new image
+ this.fragment =
this.imageModel.insertImageNode( this.getFragment() );
}
this.close( { action: action } );
--
To view, visit https://gerrit.wikimedia.org/r/228678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9c04395408301f514ff7e9a224b8e2c30d64896
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
