jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/195238 )
Change subject: Render HTML attributes in ce.View#initialize rather than in the
constructor
......................................................................
Render HTML attributes in ce.View#initialize rather than in the constructor
This means that when this.$element is changed, miscellaneous attributes
aren't removed any more. For instance, if a table cell has
style="background: red;" and the user changes it to a heading cell,
the red background will no longer disappear.
(It already didn't disappear in the final version that ends up
being saved, but until now the rendering lied and didn't show the
red background.)
Change-Id: Ib552bd1e124f1bc932454fda07056d4979925b9e
---
M src/ce/ve.ce.View.js
1 file changed, 14 insertions(+), 15 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ce/ve.ce.View.js b/src/ce/ve.ce.View.js
index ec14cf2..71e32b5 100644
--- a/src/ce/ve.ce.View.js
+++ b/src/ce/ve.ce.View.js
@@ -36,21 +36,6 @@
teardown: 'onTeardown'
} );
- if ( this.model.element && this.model.element.originalDomElementsIndex
!== undefined ) {
- // Render attributes from original DOM elements
- ve.dm.Converter.static.renderHtmlAttributeList(
- this.model.getOriginalDomElements(
this.model.getStore() ),
- this.$element,
- this.constructor.static.renderHtmlAttributes,
- // computed attributes
- true,
- // deep
- !( this.model instanceof ve.dm.Node ) ||
- !this.model.canHaveChildren() ||
- this.model.handlesOwnChildren()
- );
- }
-
// Initialize
this.initialize();
};
@@ -121,6 +106,20 @@
* this.$element is replaced.
*/
ve.ce.View.prototype.initialize = function () {
+ if ( this.model.element && this.model.element.originalDomElementsIndex
!== undefined ) {
+ // Render attributes from original DOM elements
+ ve.dm.Converter.static.renderHtmlAttributeList(
+ this.model.getOriginalDomElements(
this.model.getStore() ),
+ this.$element,
+ this.constructor.static.renderHtmlAttributes,
+ // computed attributes
+ true,
+ // deep
+ !( this.model instanceof ve.dm.Node ) ||
+ !this.model.canHaveChildren() ||
+ this.model.handlesOwnChildren()
+ );
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/195238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib552bd1e124f1bc932454fda07056d4979925b9e
Gerrit-PatchSet: 5
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: DLynch <dly...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
