diff --git a/package.json b/package.json index 16fd7f8380..0efb6cfd03 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "cljs:electron-watch": "clojure -M:cljs watch app electron --config-merge '{:asset-path \"./js\"}'", "cljs:release": "clojure -M:cljs release app publishing electron", "cljs:release-electron": "clojure -M:cljs release app electron --debug && clojure -M:cljs release publishing", - "cljs:release-app": "clojure -M:cljs release app", + "cljs:release-app": "clojure -M:cljs release app --config-merge '{:compiler-options {:output-feature-set :es6}}'", "cljs:release-android-app": "clojure -M:cljs release app --config-merge '{:compiler-options {:output-feature-set :es6}}'", "cljs:test": "clojure -M:test compile test", "cljs:run-test": "node static/tests.js", diff --git a/public/index.html b/public/index.html index bcdaf496f6..e361001b68 100644 --- a/public/index.html +++ b/public/index.html @@ -46,7 +46,6 @@ - diff --git a/src/main/frontend/ui.cljs b/src/main/frontend/ui.cljs index cd4813e4d3..1252052030 100644 --- a/src/main/frontend/ui.cljs +++ b/src/main/frontend/ui.cljs @@ -302,9 +302,13 @@ (defn setup-system-theme-effect! [] (let [^js schemaMedia (js/window.matchMedia "(prefers-color-scheme: dark)")] - (.addEventListener schemaMedia "change" state/sync-system-theme!) + (try (.addEventListener schemaMedia "change" state/sync-system-theme!) + (catch js/Error _error + (.addListener schemaMedia state/sync-system-theme!))) (state/sync-system-theme!) - #(.removeEventListener schemaMedia "change" state/sync-system-theme!))) + #(try (.removeEventListener schemaMedia "change" state/sync-system-theme!) + (catch js/Error _error + (.removeListener schemaMedia state/sync-system-theme!))))) (defn set-global-active-keystroke [val] (.setAttribute js/document.body "data-active-keystroke" val))