From ec4f9066189fbab4368a275e9cd654dc7ad48217 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 16 Feb 2022 16:15:22 +0100 Subject: [PATCH] Fix toggling sidebar on mobile in admin pages --- app/javascript/flavours/glitch/packs/admin.js | 56 ++++++------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/app/javascript/flavours/glitch/packs/admin.js b/app/javascript/flavours/glitch/packs/admin.js index b26df932ca..4c09ddb05c 100644 --- a/app/javascript/flavours/glitch/packs/admin.js +++ b/app/javascript/flavours/glitch/packs/admin.js @@ -1,48 +1,24 @@ import 'packs/public-path'; -import loadPolyfills from 'flavours/glitch/util/load_polyfills'; import ready from 'flavours/glitch/util/ready'; -import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions'; -function main() { - const { delegate } = require('@rails/ujs'); +ready(() => { + const React = require('react'); + const ReactDOM = require('react-dom'); - ready(() => { - const React = require('react'); - const ReactDOM = require('react-dom'); + [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => { + const componentName = element.getAttribute('data-admin-component'); + const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props')); - [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => { - const componentName = element.getAttribute('data-admin-component'); - const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props')); - - import('flavours/glitch/containers/admin_component').then(({ default: AdminComponent }) => { - return import('flavours/glitch/components/admin/' + componentName).then(({ default: Component }) => { - ReactDOM.render(( - - - - ), element); - }); - }).catch(error => { - console.error(error); + import('flavours/glitch/containers/admin_component').then(({ default: AdminComponent }) => { + return import('flavours/glitch/components/admin/' + componentName).then(({ default: Component }) => { + ReactDOM.render(( + + + + ), element); }); + }).catch(error => { + console.error(error); }); }); - - delegate(document, '.sidebar__toggle__icon', 'click', () => { - const target = document.querySelector('.sidebar ul'); - - if (target.style.display === 'block') { - target.style.display = 'none'; - } else { - target.style.display = 'block'; - } - }); -} - -loadPolyfills() - .then(main) - .then(loadKeyboardExtensions) - .catch(error => { - console.error(error); - - }); +});