jenkins-bot has submitted this change and it was merged.
Change subject: Fix for check if data is balanced
......................................................................
Fix for check if data is balanced
Previous check wouldn't make sense, cause the last offset in the data
could be that one that makes data balanced (and j is increased always
after iteration).
Change-Id: Ie9498d0ac9e3417d09b8b3043bf3281e7dfbf9db
---
M modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js
M modules/ve/dm/ve.dm.Converter.js
M modules/ve/test/dm/ve.dm.example.js
3 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js
b/modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js
index 411f340..63908d8 100644
--- a/modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWBlockImageNode.js
@@ -26,6 +26,8 @@
ve.dm.MWBlockImageNode.static.name = 'MWblockimage';
+ve.dm.MWBlockImageNode.static.storeHtmlAttributes = [ 'data-parsoid' ];
+
ve.dm.MWBlockImageNode.static.handlesOwnChildren = true;
ve.dm.MWBlockImageNode.static.childNodeTypes = [ 'MWimagecaption' ];
diff --git a/modules/ve/dm/ve.dm.Converter.js b/modules/ve/dm/ve.dm.Converter.js
index 0bb23bd..fdc6e0f 100644
--- a/modules/ve/dm/ve.dm.Converter.js
+++ b/modules/ve/dm/ve.dm.Converter.js
@@ -973,7 +973,7 @@
}
j++;
}
- if ( j >= data.length ) {
+ if ( depth !== 0 ) {
throw new Error( 'Unbalanced data: looking for
closing /' +
dataElement.type );
}
diff --git a/modules/ve/test/dm/ve.dm.example.js
b/modules/ve/test/dm/ve.dm.example.js
index 3d6c7c7..6e4c29a 100644
--- a/modules/ve/test/dm/ve.dm.example.js
+++ b/modules/ve/test/dm/ve.dm.example.js
@@ -3122,6 +3122,24 @@
{ 'type': '/paragraph' },
{ 'type': '/div' }
]
+ },
+ 'thumb image': {
+ 'html': '<body><figure typeof="mw:Image/Thumb"><a
rel="mw:thumb" href="Foo"><img src="Bar" width="1" height="2"
resource="FooBar"></a></figure></body>',
+ 'data': [
+ {
+ 'type': 'MWblockimage',
+ 'attributes': {
+ 'type': 'thumb',
+ 'align': 'right',
+ 'href': 'Foo',
+ 'src': 'Bar',
+ 'width': '1',
+ 'height': '2',
+ 'resource': 'FooBar'
+ }
+ },
+ { 'type': '/MWblockimage' }
+ ]
}
};
--
To view, visit https://gerrit.wikimedia.org/r/64643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9498d0ac9e3417d09b8b3043bf3281e7dfbf9db
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Inez <i...@wikia-inc.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
