Browse Source

fix app not working on iOS 13

llcc 3 years ago
parent
commit
e93480b664
3 changed files with 7 additions and 4 deletions
  1. 1 1
      package.json
  2. 0 1
      public/index.html
  3. 6 2
      src/main/frontend/ui.cljs

+ 1 - 1
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",

+ 0 - 1
public/index.html

@@ -46,7 +46,6 @@
 </script>
 <script defer src="/static/js/highlight.min.js"></script>
 <script defer src="/static/js/interact.min.js"></script>
-<script defer src="/static/js/lsplugin.core.js"></script>
 <script defer src="/static/js/main.js"></script>
 <script defer src="/static/js/code-editor.js"></script>
 <script defer src="/static/js/age-encryption.js"></script>

+ 6 - 2
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))