jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/347358 )
Change subject: Update VE core submodule to master (1338c50f5) ...................................................................... Update VE core submodule to master (1338c50f5) New changes: ae0204885 stylelint: Remove no-unsupported-browser-features overrides d744cd576 Localisation updates from https://translatewiki.net. 1338c50f5 [BREAKING CHANGE] Remove resize handlers from within DiffElement Local changes: Trigger diff element resize on dialog resize Depends-On: I82a67a4309bf76db5407ea38c26c47d14c01e921 Change-Id: I912a99edca25ff576e2872723f91afe54e36a170 --- M lib/ve M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 2 files changed, 32 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/lib/ve b/lib/ve index da9c493..1338c50 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit da9c49395a31736338875aef9cd94f204d7f821f +Subproject commit 1338c50f5888ac4c3c7da9dbf0e34bee62d36500 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index 79ff36c..26db7b3 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -205,7 +205,6 @@ */ ve.ui.MWSaveDialog.prototype.clearVisualDiff = function () { if ( this.diffElement ) { - this.diffElement.destroy(); this.diffElement = null; this.diffElementPromise = null; this.getDiffElementPromise = null; @@ -620,22 +619,48 @@ if ( isVisual ) { if ( !this.diffElement ) { if ( !this.diffElementPromise ) { - this.diffElementPromise = this.getDiffElementPromise().then( function( diffElement ) { + this.diffElementPromise = this.getDiffElementPromise().then( function ( diffElement ) { dialog.diffElement = diffElement; - dialog.$reviewVisualDiff.append( diffElement.$element ); - diffElement.positionDescriptions(); - dialog.updateSize(); + dialog.$reviewVisualDiff.empty().append( diffElement.$element ); + dialog.positionDiffElement(); } ); } return; } - this.diffElement.positionDescriptions(); + this.positionDiffElement(); } this.updateSize(); }; /** * @inheritdoc + */ +ve.ui.MWSaveDialog.prototype.setDimensions = function () { + // Parent method + ve.ui.MWSaveDialog.parent.prototype.setDimensions.apply( this, arguments ); + + this.positionDiffElement(); +}; + +/** + * Re-position elements within the diff element + * + * Should be called whenever the diff element's container has changed width. + */ +ve.ui.MWSaveDialog.prototype.positionDiffElement = function () { + var dialog = this; + if ( this.diffElement && this.panels.getCurrentItem() === this.reviewPanel ) { + setTimeout( function () { + dialog.withoutSizeTransitions( function () { + dialog.diffElement.positionDescriptions(); + dialog.updateSize(); + } ); + }, OO.ui.theme.getDialogTransitionDuration() ); + } +}; + +/** + * @inheritdoc * @param {Object} [data] * @param {boolean} [data.canReview] User can review changes * @param {boolean} [data.canPreview] User can preview changes -- To view, visit https://gerrit.wikimedia.org/r/347358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I912a99edca25ff576e2872723f91afe54e36a170 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
