From df25c9de12097f8cc087cfcec68e7d55d7441e26 Mon Sep 17 00:00:00 2001
From: BetaHuhn <schiller@mxis.ch>
Date: Wed, 7 Apr 2021 17:57:19 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Cleanup=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/drkmd-js.min.js |  2 +-
 src/drkmd.js         | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dist/drkmd-js.min.js b/dist/drkmd-js.min.js
index d0f7a81..242811d 100644
--- a/dist/drkmd-js.min.js
+++ b/dist/drkmd-js.min.js
@@ -1 +1 @@
-!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).drkmdJs=t()}}((function(){return function t(e,o,n){function r(a,d){if(!o[a]){if(!e[a]){var c="function"==typeof require&&require;if(!d&&c)return c(a,!0);if(i)return i(a,!0);var u=new Error("Cannot find module '"+a+"'");throw u.code="MODULE_NOT_FOUND",u}var s=o[a]={exports:{}};e[a][0].call(s.exports,(function(t){return r(e[a][1][t]||t)}),s,s.exports,t,e,o,n)}return o[a].exports}for(var i="function"==typeof require&&require,a=0;a<n.length;a++)r(n[a]);return r}({1:[function(t,e,o){"use strict";function n(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}Object.defineProperty(o,"__esModule",{value:!0}),o.default=o.IS_BROWSER=void 0;var r="undefined"!=typeof window;o.IS_BROWSER=r;var i=function(){function t(e){var o=this;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t);e=Object.assign({},{top:"unset",bottom:"20px",right:"20px",left:"unset",attach:!1,buttonLight:"#fff",buttonDark:"#000",events:!0,cookie:!1,localStorage:!0,label:"🌓",autoMatchOsTheme:!0,defaultTheme:"light"},e),this.options=e,this.dark=!1,e.autoMatchOsTheme&&(window.matchMedia("(prefers-color-scheme: dark)").addListener((function(t){return t.matches&&o._switchThemePrefers()})),window.matchMedia("(prefers-color-scheme: light)").addListener((function(t){return t.matches&&o._switchThemePrefers()})));var n=this._getStorageValue();null!==n?"true"===n||!0===n?this.toDark():this.toLight():e.autoMatchOsTheme?this._preferedTheme()?this.toDark():this.toLight():"light"===e.defaultTheme?this.toLight():this.toDark()}var e,o,r;return e=t,(o=[{key:"attach",value:function(){var t=this,e="\n            .drkmd-toggle-button{\n                position: fixed;\n                z-index: 1000;\n                left: ".concat(this.options.left,";\n                right: ").concat(this.options.right,";\n                bottom: ").concat(this.options.bottom,";\n                top: ").concat(this.options.top,";\n                height: 3rem;\n                min-width: 3rem;\n                border-radius: 3rem;\n                display: flex;\n                align-items: center;\n                justify-content: center;\n                background: ").concat(this.options.buttonDark,";\n                color: ").concat(this.options.buttonLight,";\n                cursor: pointer;\n            }\n\n            .drkmd-toggle-button span{\n                margin: 0;\n                padding: 0px 10px;\n            }\n\n            .theme-dark .drkmd-toggle-button{\n                background: ").concat(this.options.buttonLight,";\n                color: ").concat(this.options.buttonDark,"\n            }\n        "),o=document.createElement("div"),n=document.createElement("span");n.innerHTML=this.options.label,o.className="drkmd-toggle-button",o.setAttribute("title","Toggle dark mode"),o.setAttribute("aria-label","Toggle dark mode"),o.setAttribute("aria-checked","false"),o.setAttribute("role","checkbox"),o.appendChild(n),o.addEventListener("click",(function(){!0===t.dark?t.toLight():t.toDark()})),document.body.insertBefore(o,document.body.firstChild),this._addStyle(e)}},{key:"toLight",value:function(){this.options.events&&window.dispatchEvent(new CustomEvent("theme-change",{detail:{to:"light"}})),document.documentElement.setAttribute("data-theme","light"),this._setStorageValue(!1),document.body.classList.remove("theme-dark"),document.body.classList.add("theme-light"),this.dark=!1}},{key:"toDark",value:function(){this.options.events&&window.dispatchEvent(new CustomEvent("theme-change",{detail:{to:"dark"}})),document.documentElement.setAttribute("data-theme","dark"),this._setStorageValue(!0),document.body.classList.add("theme-dark"),document.body.classList.remove("theme-light"),this.dark=!0}},{key:"toggle",value:function(){return this.dark?this.toLight():this.toDark(),this.dark}},{key:"isActivated",value:function(){return this.dark}},{key:"_preferedTheme",value:function(){return window.matchMedia&&window.matchMedia("(prefers-color-scheme: dark)").matches}},{key:"_switchThemePrefers",value:function(){!0===this._preferedTheme()?this.swichToDark():this.swichToLight()}},{key:"_getStorageValue",value:function(){if(this.options.localStorage&&null!==window.localStorage)return window.localStorage.getItem("darkmode");if(this.options.cookie){var t=document.cookie.match(RegExp("(?:^|;\\s*)darkmode=([^;]*)"));return t?t[1]:null}return null}},{key:"_setStorageValue",value:function(t){this.options.localStorage&&null!==window.localStorage?window.localStorage.setItem("darkmode",t):this.options.cookie&&(document.cookie="darkmode=".concat(t))}},{key:"_addStyle",value:function(t){var e=document.createElement("link");e.setAttribute("rel","stylesheet"),e.setAttribute("type","text/css"),e.setAttribute("href","data:text/css;charset=UTF-8,"+encodeURIComponent(t)),document.head.appendChild(e)}}])&&n(e.prototype,o),r&&n(e,r),t}();o.default=i},{}],2:[function(t,e,o){"use strict";function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0;var r=function(t){if(t&&t.__esModule)return t;if(null===t||"object"!==n(t)&&"function"!=typeof t)return{default:t};var e=i();if(e&&e.has(t))return e.get(t);var o={},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var a in t)if(Object.prototype.hasOwnProperty.call(t,a)){var d=r?Object.getOwnPropertyDescriptor(t,a):null;d&&(d.get||d.set)?Object.defineProperty(o,a,d):o[a]=t[a]}o.default=t,e&&e.set(t,o);return o}(t("./drkmd"));function i(){if("function"!=typeof WeakMap)return null;var t=new WeakMap;return i=function(){return t},t}var a=r.default;o.default=a;r.IS_BROWSER?function(){var t=document.querySelector("[data-drkmd-opts]"),e=document.querySelector("[data-drkmd-attach]"),o=document.querySelectorAll("[data-drkmd-toggle]"),n=document.querySelectorAll("[data-drkmd-to-light]"),i=document.querySelectorAll("[data-drkmd-to-dark]");if(!t&&!e&&o.length<1&&n.length<1&&i.length<1)window.Darkmode=r.default;else{var a=t&&t.getAttribute("data-drkmd-opts")||"{}",d=JSON.parse(a);if(window.darkmode=new r.default(d),o.length>0)for(var c=0;c<o.length;c++)o[c].addEventListener("click",(function(){window.darkmode.toggle()}));if(n.length>0)for(var u=0;u<n.length;u++)n[u].addEventListener("click",(function(){window.darkmode.toLight()}));if(i.length>0)for(var s=0;s<i.length;s++)i[s].addEventListener("click",(function(){window.darkmode.toDark()}));(window.darkmode.options.attach||e)&&window.darkmode.attach()}}():console.warn("drkmd.js: Detected environment without a `window` object")},{"./drkmd":1}]},{},[2])(2)}));
\ No newline at end of file
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).drkmdJs=t()}}((function(){return function t(e,o,n){function r(a,d){if(!o[a]){if(!e[a]){var c="function"==typeof require&&require;if(!d&&c)return c(a,!0);if(i)return i(a,!0);var u=new Error("Cannot find module '"+a+"'");throw u.code="MODULE_NOT_FOUND",u}var s=o[a]={exports:{}};e[a][0].call(s.exports,(function(t){return r(e[a][1][t]||t)}),s,s.exports,t,e,o,n)}return o[a].exports}for(var i="function"==typeof require&&require,a=0;a<n.length;a++)r(n[a]);return r}({1:[function(t,e,o){"use strict";function n(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}Object.defineProperty(o,"__esModule",{value:!0}),o.default=o.IS_BROWSER=void 0;var r="undefined"!=typeof window;o.IS_BROWSER=r;var i=function(){function t(e){var o=this;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t);e=Object.assign({},{top:"unset",bottom:"20px",right:"20px",left:"unset",attach:!1,buttonLight:"#fff",buttonDark:"#000",events:!0,cookie:!1,localStorage:!0,label:"🌓",autoMatchOsTheme:!0,defaultTheme:"light"},e),this.options=e,this.dark=!1,e.autoMatchOsTheme&&(window.matchMedia("(prefers-color-scheme: dark)").addListener((function(t){return t.matches&&o._switchThemePrefers()})),window.matchMedia("(prefers-color-scheme: light)").addListener((function(t){return t.matches&&o._switchThemePrefers()})));var n=this._getStorageValue();null!==n?"true"===n||!0===n?this.toDark():this.toLight():e.autoMatchOsTheme?this._preferedTheme()?this.toDark():this.toLight():"light"===e.defaultTheme?this.toLight():this.toDark()}var e,o,r;return e=t,(o=[{key:"attach",value:function(){var t=this,e="\n            .drkmd-toggle-button{\n                position: fixed;\n                z-index: 1000;\n                left: ".concat(this.options.left,";\n                right: ").concat(this.options.right,";\n                bottom: ").concat(this.options.bottom,";\n                top: ").concat(this.options.top,";\n                height: 3rem;\n                min-width: 3rem;\n                border-radius: 3rem;\n                display: flex;\n                align-items: center;\n                justify-content: center;\n                background: ").concat(this.options.buttonDark,";\n                color: ").concat(this.options.buttonLight,";\n                cursor: pointer;\n            }\n\n            .drkmd-toggle-button span{\n                margin: 0;\n                padding: 0px 10px;\n            }\n\n            .theme-dark .drkmd-toggle-button{\n                background: ").concat(this.options.buttonLight,";\n                color: ").concat(this.options.buttonDark,"\n            }\n        "),o=document.createElement("div"),n=document.createElement("span");n.innerHTML=this.options.label,o.className="drkmd-toggle-button",o.setAttribute("title","Toggle dark mode"),o.setAttribute("aria-label","Toggle dark mode"),o.setAttribute("aria-checked","false"),o.setAttribute("role","checkbox"),o.appendChild(n),o.addEventListener("click",(function(){t.toggle()})),document.body.insertBefore(o,document.body.firstChild),this._addStyle(e)}},{key:"toLight",value:function(){this.options.events&&window.dispatchEvent(new CustomEvent("theme-change",{detail:{to:"light"}})),document.documentElement.setAttribute("data-theme","light"),document.body.classList.remove("theme-dark"),document.body.classList.add("theme-light"),this._setStorageValue(!1),this.dark=!1}},{key:"toDark",value:function(){this.options.events&&window.dispatchEvent(new CustomEvent("theme-change",{detail:{to:"dark"}})),document.documentElement.setAttribute("data-theme","dark"),document.body.classList.add("theme-dark"),document.body.classList.remove("theme-light"),this._setStorageValue(!0),this.dark=!0}},{key:"toggle",value:function(){return this.dark?this.toLight():this.toDark(),this.dark}},{key:"isActivated",value:function(){return this.dark}},{key:"_preferedTheme",value:function(){return window.matchMedia&&window.matchMedia("(prefers-color-scheme: dark)").matches}},{key:"_switchThemePrefers",value:function(){!0===this._preferedTheme()?this.toDark():this.toLight()}},{key:"_getStorageValue",value:function(){if(this.options.localStorage&&null!==window.localStorage)return window.localStorage.getItem("darkmode");if(this.options.cookie){var t=document.cookie.match(RegExp("(?:^|;\\s*)darkmode=([^;]*)"));return t?t[1]:null}return null}},{key:"_setStorageValue",value:function(t){this.options.localStorage&&null!==window.localStorage?window.localStorage.setItem("darkmode",t):this.options.cookie&&(document.cookie="darkmode=".concat(t))}},{key:"_addStyle",value:function(t){var e=document.createElement("link");e.setAttribute("rel","stylesheet"),e.setAttribute("type","text/css"),e.setAttribute("href","data:text/css;charset=UTF-8,"+encodeURIComponent(t)),document.head.appendChild(e)}}])&&n(e.prototype,o),r&&n(e,r),t}();o.default=i},{}],2:[function(t,e,o){"use strict";function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}Object.defineProperty(o,"__esModule",{value:!0}),o.default=void 0;var r=function(t){if(t&&t.__esModule)return t;if(null===t||"object"!==n(t)&&"function"!=typeof t)return{default:t};var e=i();if(e&&e.has(t))return e.get(t);var o={},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var a in t)if(Object.prototype.hasOwnProperty.call(t,a)){var d=r?Object.getOwnPropertyDescriptor(t,a):null;d&&(d.get||d.set)?Object.defineProperty(o,a,d):o[a]=t[a]}o.default=t,e&&e.set(t,o);return o}(t("./drkmd"));function i(){if("function"!=typeof WeakMap)return null;var t=new WeakMap;return i=function(){return t},t}var a=r.default;o.default=a;r.IS_BROWSER?function(){var t=document.querySelector("[data-drkmd-opts]"),e=document.querySelector("[data-drkmd-attach]"),o=document.querySelectorAll("[data-drkmd-toggle]"),n=document.querySelectorAll("[data-drkmd-to-light]"),i=document.querySelectorAll("[data-drkmd-to-dark]");if(!t&&!e&&o.length<1&&n.length<1&&i.length<1)window.Darkmode=r.default;else{var a=t&&t.getAttribute("data-drkmd-opts")||"{}",d=JSON.parse(a);if(window.darkmode=new r.default(d),o.length>0)for(var c=0;c<o.length;c++)o[c].addEventListener("click",(function(){window.darkmode.toggle()}));if(n.length>0)for(var u=0;u<n.length;u++)n[u].addEventListener("click",(function(){window.darkmode.toLight()}));if(i.length>0)for(var s=0;s<i.length;s++)i[s].addEventListener("click",(function(){window.darkmode.toDark()}));(window.darkmode.options.attach||e)&&window.darkmode.attach()}}():console.warn("drkmd.js: Detected environment without a `window` object")},{"./drkmd":1}]},{},[2])(2)}));
\ No newline at end of file
diff --git a/src/drkmd.js b/src/drkmd.js
index c4f6785..c88b128 100644
--- a/src/drkmd.js
+++ b/src/drkmd.js
@@ -73,6 +73,7 @@ export default class Darkmode {
 		const span = document.createElement('span')
 		span.innerHTML = this.options.label
 		div.className = 'drkmd-toggle-button'
+
 		div.setAttribute('title', 'Toggle dark mode')
 		div.setAttribute('aria-label', 'Toggle dark mode')
 		div.setAttribute('aria-checked', 'false')
@@ -80,7 +81,7 @@ export default class Darkmode {
 		div.appendChild(span)
 
 		div.addEventListener('click', () => {
-			this.dark === true ? this.toLight() : this.toDark()
+			this.toggle()
 		})
 
 		document.body.insertBefore(div, document.body.firstChild)
@@ -89,19 +90,23 @@ export default class Darkmode {
 
 	toLight() {
 		if (this.options.events) window.dispatchEvent(new CustomEvent('theme-change', { detail: { to: 'light' } }))
+
 		document.documentElement.setAttribute('data-theme', 'light')
-		this._setStorageValue(false)
 		document.body.classList.remove('theme-dark')
 		document.body.classList.add('theme-light')
+
+		this._setStorageValue(false)
 		this.dark = false
 	}
 
 	toDark() {
 		if (this.options.events) window.dispatchEvent(new CustomEvent('theme-change', { detail: { to: 'dark' } }))
+
 		document.documentElement.setAttribute('data-theme', 'dark')
-		this._setStorageValue(true)
 		document.body.classList.add('theme-dark')
 		document.body.classList.remove('theme-light')
+
+		this._setStorageValue(true)
 		this.dark = true
 	}
 
@@ -119,7 +124,7 @@ export default class Darkmode {
 	}
 
 	_switchThemePrefers() {
-		this._preferedTheme() === true ? this.swichToDark() : this.swichToLight()
+		this._preferedTheme() === true ? this.toDark() : this.toLight()
 	}
 
 	_getStorageValue() {
@@ -150,6 +155,7 @@ export default class Darkmode {
           'href',
           'data:text/css;charset=UTF-8,' + encodeURIComponent(css)
 		)
+
 		document.head.appendChild(linkElement)
 	}
 }
\ No newline at end of file