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

Change subject: Call afterRender whether or not images emit 'load'
......................................................................


Call afterRender whether or not images emit 'load'

MWExtensionNodes currently don't call afterRender if the image
is already loaded, which can happen if we decide not to rerender
after an update (e.g. when the response is an error).

Change-Id: Ic9c11e446a7cc789bb20680466709ff2ad5cb22e
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 5bd3a0b..6032f4c 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -100,6 +100,9 @@
        var node = this,
                $images = this.$element.find( 
'img:not([width]),img:not([height])' );
 
+       // Mixin method
+       ve.ce.GeneratedContentNode.prototype.afterRender.call( this );
+
        // Images missing a dimension change size after load
        // TODO: Ignore images which have dimensions defined in CSS, if 
performant
        if ( $images.length ) {
@@ -107,9 +110,6 @@
                        // Mixin method
                        ve.ce.GeneratedContentNode.prototype.afterRender.call( 
node );
                } );
-       } else {
-               // Mixin method
-               ve.ce.GeneratedContentNode.prototype.afterRender.call( this );
        }
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9c11e446a7cc789bb20680466709ff2ad5cb22e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders <thalia.e.c...@googlemail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to