From f1caa0b316c0be7c957e34a4bcc9f392023379d3 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 3 Jul 2017 16:23:28 +0000
Subject: [PATCH] Implement review comments for !11963 from @filipa.
- Disable an ESLint check rather than work around it (by
converting `OAuthRememberMe` from a regular class to a
static class.
- Scope `$` calls inside `OAuthRememberMe`
---
app/assets/javascripts/dispatcher.js | 2 +-
app/assets/javascripts/oauth_remember_me.js | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index a58d1be68b5..e924fde60bf 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -128,7 +128,7 @@ import OAuthRememberMe from './oauth_remember_me';
case 'sessions:new':
new UsernameValidator();
new ActiveTabMemoizer();
- new OAuthRememberMe({ container: $("#remember_me") }).bindEvents();
+ new OAuthRememberMe({ container: $(".omniauth-container") }).bindEvents();
break;
case 'projects:boards:show':
case 'projects:boards:index':
diff --git a/app/assets/javascripts/oauth_remember_me.js b/app/assets/javascripts/oauth_remember_me.js
index 8f4796f2ede..ffc2dd6bbca 100644
--- a/app/assets/javascripts/oauth_remember_me.js
+++ b/app/assets/javascripts/oauth_remember_me.js
@@ -12,13 +12,14 @@ export default class OAuthRememberMe {
}
bindEvents() {
- this.container.on('click', this.constructor.toggleRememberMe);
+ $('#remember_me', this.container).on('click', this.toggleRememberMe);
}
- static toggleRememberMe(event) {
+ // eslint-disable-next-line class-methods-use-this
+ toggleRememberMe(event) {
const rememberMe = $(event.target).is(':checked');
- $('.oauth-login').each((i, element) => {
+ $('.oauth-login', this.container).each((i, element) => {
const href = $(element).attr('href');
if (rememberMe) {
--
GitLab