wikimedia/mediawiki-extensions-WikiEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiEditor synced 2024-11-27 17:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Realtime Preview: don't show error message and manual-mode bar at the same time"

Browse source
This commit is contained in:
jenkins-bot 2022-07-25 18:46:49 +00:00 committed by Gerrit Code Review
parent e15e61c426 296ffc58f8
commit 4d02fb808b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/realtimepreview/RealtimePreview.js
View file

@ -274,6 +274,7 @@ RealtimePreview.prototype.enableFeatureWhenScreenIsWideEnough = function () {
RealtimePreview.prototype.showError = function ( $msg ) {
this.$previewNode.hide();
this.reloadButton.toggle( false );
this.manualWidget.toggle( false );
// There is no need for a default message because mw.Api.getErrorMessage() will
// always provide something (even for no network connection, server-side fatal errors, etc.).
this.errorLayout.setMessage( $msg );
@ -285,8 +286,8 @@ RealtimePreview.prototype.showError = function ( $msg ) {
* @param {number} time
*/
RealtimePreview.prototype.checkResponseTimes = function ( time ) {
// Don't track response times if we're already in manual mode.
if ( this.inManualMode ) {
// Don't track response times if we're already in manual mode or an error is shown.
if ( this.inManualMode || this.errorLayout.isVisible() ) {
return;
}
@ -358,6 +359,9 @@ RealtimePreview.prototype.doRealtimePreview = function ( forceUpdate ) {
if ( !this.errorLayout.isVisible() ) {
// Only re-show the reload button if no error message is currently showing.
this.reloadButton.toggle( true );
} else {
// Don't show both the error message and the manual-mode bar at the same time.
this.manualWidget.toggle( false );
}
this.manualWidget.setDisabled( false );
this.isPreviewing = false;