From c94c04a9d1ce9555ae35a134165533d77b2344b8 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Mon, 13 May 2019 11:29:56 +0200
Subject: [PATCH] Run the no-js to js class switch as early as possible.
---
opentech/static_src/src/javascript/main.js | 7 ++++---
opentech/static_src/src/sass/apply/base/_base.scss | 2 +-
opentech/static_src/src/sass/public/base/_base.scss | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opentech/static_src/src/javascript/main.js b/opentech/static_src/src/javascript/main.js
index 9d1e0e9e5..d1440f062 100644
--- a/opentech/static_src/src/javascript/main.js
+++ b/opentech/static_src/src/javascript/main.js
@@ -3,6 +3,9 @@
'use strict';
+ // Replace no-js with js class if js is enabled.
+ document.querySelector('html').classList.replace('no-js', 'js');
+
let Search = class {
static selector() {
return '.js-search-toggle';
@@ -104,9 +107,6 @@
}
};
- // Replace no-js with js class if js is enabled.
- document.querySelector('html').classList.replace('no-js', 'js');
-
$(MobileMenu.selector()).each((index, el) => {
new MobileMenu($(el), $('.js-mobile-menu-close'), $('.header__menus--mobile'), $('.header__search'));
});
@@ -155,4 +155,5 @@
const adminbarHeight = $('.admin-bar').outerHeight();
document.documentElement.style.setProperty('--header-admin-height', headerHeight + adminbarHeight + 'px');
});
+
})(jQuery);
diff --git a/opentech/static_src/src/sass/apply/base/_base.scss b/opentech/static_src/src/sass/apply/base/_base.scss
index eeee4df8c..2eb952502 100644
--- a/opentech/static_src/src/sass/apply/base/_base.scss
+++ b/opentech/static_src/src/sass/apply/base/_base.scss
@@ -95,7 +95,7 @@ ol {
.no-js-hidden,
%no-js-hidden {
- html.nojs & {
+ html.no-js & {
@extend %is-hidden;
}
}
diff --git a/opentech/static_src/src/sass/public/base/_base.scss b/opentech/static_src/src/sass/public/base/_base.scss
index fd23d62da..6ca82b90e 100644
--- a/opentech/static_src/src/sass/public/base/_base.scss
+++ b/opentech/static_src/src/sass/public/base/_base.scss
@@ -89,7 +89,7 @@ ol {
.no-js-hidden,
%no-js-hidden {
- html.nojs & {
+ html.no-js & {
@extend %is-hidden;
}
}
--
GitLab