jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up I11b9f0ab: Only make icon on transclusions that 
require it
......................................................................


Follow-up I11b9f0ab: Only make icon on transclusions that require it

When deciding to add an icon to a transclusion (specifically, when
it is hidden) do so only if it is justified. Otherwise the
node becomes the icon even when it has information in it, which,
starting from the latest OOjs UI change, also has specific (small)
sizing.

Change-Id: I521c92fc645a392077e6cc90f55557c4cea3cb11
---
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 139e7ce..04ad557 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -131,7 +131,6 @@
 
        // Since render replaces this.$element with a new node, we need to make 
sure
        // our iconElement is defined again to be this.$element
-       this.setIconElement( this.$element );
        this.$element.addClass( 've-ce-mwTransclusionNode' );
        if (
                $( generatedContents ).text().trim().length === 0 &&
@@ -141,6 +140,7 @@
                        this.$element.height() < 8
                )
        ) {
+               this.setIconElement( this.$element );
                // The template is empty or hidden
                this.setIcon( 'template' );
        } else {

-- 
To view, visit https://gerrit.wikimedia.org/r/195313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I521c92fc645a392077e6cc90f55557c4cea3cb11
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to