Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56595
Change subject: Store null for width/height in MWImageNode when value not set.
......................................................................
Store null for width/height in MWImageNode when value not set.
Using element.height was returning 0 if the attribute was empty
when in fact what we mean to store is null (i.e. auto height).
This takes care of the writing of attributes in CE as jQuery
ignores an attribute-set command if the value is null.
Bug: 56336
Change-Id: I297a1d0a07e9ebf9d0110fb1cdf266f8415f25b7
---
M modules/ve/dm/nodes/ve.dm.MWImageNode.js
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/95/56595/1
diff --git a/modules/ve/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve/dm/nodes/ve.dm.MWImageNode.js
index 6601c84..a9bf9ab 100644
--- a/modules/ve/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWImageNode.js
@@ -31,12 +31,16 @@
ve.dm.MWImageNode.static.matchRdfaTypes = [ 'mw:Image' ];
ve.dm.MWImageNode.static.toDataElement = function ( domElements ) {
+ var $node = $(domElements[0].childNodes[0]),
+ width = $node.attr('width'),
+ height = $node.attr('height');
+
return {
'type': 'MWimage',
'attributes': {
- 'src': domElements[0].childNodes[0].src,
- 'width': domElements[0].childNodes[0].width,
- 'height': domElements[0].childNodes[0].height
+ 'src': $node.attr('src'),
+ 'width': width !== '' ? Number(width) : null,
+ 'height': height !== '' ? Number(height) : null
}
};
};
--
To view, visit https://gerrit.wikimedia.org/r/56595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I297a1d0a07e9ebf9d0110fb1cdf266f8415f25b7
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
