[MediaWiki-commits] [Gerrit] Close main menu before showing wikigrok roulette error - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Close main menu before showing wikigrok roulette error
......................................................................


Close main menu before showing wikigrok roulette error

Also fix error drawer style.

Change-Id: Id142ee0175c9e4e11991662269d3771626724b1e
---
M javascripts/modules/wikiGrokRoulette/init.js
M less/drawer.less
M templates/modules/wikiGrokRoulette/error.hogan
3 files changed, 7 insertions(+), 4 deletions(-)

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



diff --git a/javascripts/modules/wikiGrokRoulette/init.js 
b/javascripts/modules/wikiGrokRoulette/init.js
index ebbab0e..5733505 100644
--- a/javascripts/modules/wikiGrokRoulette/init.js
+++ b/javascripts/modules/wikiGrokRoulette/init.js
@@ -1,6 +1,7 @@
 ( function ( M, $ ) {
        M.assertMode( [ 'alpha' ] );
        var $wikiGrokMenuItem =  $( '#mw-mf-page-left' ).find( 
'.wikigrok-roulette' ),
+               mainMenu = M.require( 'mainmenu' ),
                LoadingOverlay = M.require( 'LoadingOverlay' ),
                ErrorDrawer = M.require( 'modules/wikiGrokRoulette/ErrorDrawer' 
);
 
@@ -44,6 +45,8 @@
                        } ).fail( function () {
                                loadingOverlay.hide( false );
                                new ErrorDrawer();
+                       } ).always( function () {
+                               mainMenu.closeNavigationDrawers();
                        } );
                } );
        }
diff --git a/less/drawer.less b/less/drawer.less
index 9733d2e..868f769 100644
--- a/less/drawer.less
+++ b/less/drawer.less
@@ -62,9 +62,9 @@
 
        &.wikigrok {
                padding: 0;
-               .pane.error {
-                       padding-top: 1em;
-               }
+       }
+       .wikigrok-error {
+               padding-top: 1em;
        }
 }
 
diff --git a/templates/modules/wikiGrokRoulette/error.hogan 
b/templates/modules/wikiGrokRoulette/error.hogan
index 16e7a9b..231582a 100644
--- a/templates/modules/wikiGrokRoulette/error.hogan
+++ b/templates/modules/wikiGrokRoulette/error.hogan
@@ -1,4 +1,4 @@
-<div class="pane error">
+<div class="wikigrok-error">
        <h2>Uh oh!</h2>
        <p>There was a problem.</p>
        <button class="close inline mw-ui-button 
mw-ui-progressive">Okay</button>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id142ee0175c9e4e11991662269d3771626724b1e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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