SuchetaG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218656
Change subject: Converting an error image (red link) from block to inline does
not lose its error state
......................................................................
Converting an error image (red link) from block to inline does not lose its
error state
Bug: T101085
Change-Id: I521be8fbcbab27d712ec408ea7048dca2eaab198
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/56/218656/1
diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index f9c7905..4b3ea44 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -432,7 +432,7 @@
* @throws {Error} Unknown image node type
*/
ve.dm.MWImageModel.prototype.insertImageNode = function ( fragment ) {
- var editAttributes, captionDoc,
+ var editAttributes, captionDoc, changedSource,
offset,
contentToInsert = [],
nodeType = this.getImageNodeType(),
@@ -449,7 +449,9 @@
delete editAttributes.originalClasses;
delete editAttributes.unrecognizedClasses;
// Newly created images must have valid URLs, so remove the error
attribute
- delete editAttributes.isError;
+ if ( changedSource ) {
+ delete editAttributes.isError;
+ }
contentToInsert = [
{
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index f30bdbc..7815c5d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -722,6 +722,7 @@
*/
ve.ui.MWMediaDialog.prototype.confirmSelectedImage = function () {
var obj = {},
+ attributes,
info = this.selectedImageInfo;
if ( info ) {
@@ -756,6 +757,7 @@
},
info
);
+ attributes.changedSource = true;
// Update filename
this.filenameFieldset.setLabel(
this.imageModel.getFilename()
--
To view, visit https://gerrit.wikimedia.org/r/218656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I521be8fbcbab27d712ec408ea7048dca2eaab198
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: SuchetaG <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
