jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340715 )
Change subject: DiffElement: Allow a node change to be an attribute change
*and* a linear diff
......................................................................
DiffElement: Allow a node change to be an attribute change *and* a linear diff
Change-Id: I0cb2f28f12cda08593ea9d0511d6893ec28b6d16
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ui/elements/ve.ui.DiffElement.js
b/src/ui/elements/ve.ui.DiffElement.js
index 70a1126..5080673 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -370,7 +370,8 @@
nodeDiffData = diffInfo.linearDiff;
annotatedData = this.annotateNode( nodeDiffData );
ve.batchSplice( nodeData, nodeRangeStart + 1,
node.node.length, annotatedData );
- } else {
+ }
+ if ( diffInfo.attributeChange ) {
// If there is no content change, just add change class
nodeData[ nodeRangeStart ] = this.addAttributesToNode(
nodeData[ nodeRangeStart ], this.newDoc, {
'data-diff-action': 'structural-change' }
--
To view, visit https://gerrit.wikimedia.org/r/340715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cb2f28f12cda08593ea9d0511d6893ec28b6d16
Gerrit-PatchSet: 5
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Tchanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
