Clipboard Fix

1John419 · May 12, 2024 · 9859f34 · 9859f34
1 parent edd5a2f
commit 9859f34
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/js/Model/SettingModel.js b/js/Model/SettingModel.js
@@ -166,7 +166,7 @@ class SettingModel {
       themeName: 'Chalcedony',
       themeClass: 'theme--chalcedony-light'
     });
-        queue.publish('themes.update', this.themes);
+    queue.publish('themes.update', this.themes);
   }
 
   restore() {

diff --git a/js/View/BookmarkListView.js b/js/View/BookmarkListView.js
@@ -435,7 +435,7 @@ class BookmarkListView {
       if (target.classList.contains('btn-result')) {
         if (this.clipboardMode) {
           const text = target.textContent;
-          navigator.clipboard.writeText(text);
+          util.writeClipboardText(text);
         } else {
           const verseIdx = parseInt(target.dataset.verseIdx);
           if (this.strongMode) {

diff --git a/js/View/HelpReadView.js b/js/View/HelpReadView.js
@@ -102,7 +102,7 @@ class HelpReadView {
       this.scroll.innerHTML = html;
       this.scroll.scrollTop = 0;
     }).catch((error) => {
-      console.log(error);
+      console.log(error.message);
     });
   }
 

diff --git a/js/View/ReadView.js b/js/View/ReadView.js
@@ -226,7 +226,7 @@ class ReadView {
       if (btnVerse) {
         if (this.clipboardMode) {
           const text = `${this.btnBanner.textContent}:${btnVerse.textContent}`;
-          navigator.clipboard.writeText(text);
+          util.writeClipboardText(text);
         } else {
           this.verseClick(btnVerse);
         }

diff --git a/js/View/SearchResultView.js b/js/View/SearchResultView.js
@@ -221,7 +221,7 @@ class SearchResultView {
     if (btn) {
       if (this.clipboardMode) {
         const text = btn.textContent;
-        navigator.clipboard.writeText(text);
+        util.writeClipboardText(text);
       } else {
         const verseIdx = parseInt(btn.dataset.verseIdx);
         if (this.strongMode) {

diff --git a/js/View/SettingView.js b/js/View/SettingView.js
@@ -52,7 +52,7 @@ const templateSettingFont = (modifier, name) => {
   const divSetting = template.element('div', 'setting', modifier, null, null);
   const heading = template.element('h1', 'header', modifier, null, name);
   divSetting.appendChild(heading);
-  const divCarousel = templateSettingCarousel('font', "Font");
+  const divCarousel = templateSettingCarousel('font', 'Font');
   divSetting.appendChild(divCarousel);
   return divSetting;
 };

diff --git a/js/util.js b/js/util.js
@@ -24,3 +24,11 @@ util.sideScrollElement = (scrollElement, element) => {
   const x = element.offsetLeft - 8;
   scrollElement.scrollLeft = x;
 };
+
+util.writeClipboardText = async (text) => {
+  try {
+    await navigator.clipboard.writeText(text);
+  } catch (error) {
+    console.log(error.message);
+  }
+};
diff --git a/sw.js b/sw.js
@@ -2,7 +2,7 @@
 
 const appCaches = [
   {
-    name: 'core-20240509.02',
+    name: 'core-20240509.03',
     urls: [
       '/',
       '/bundle.js',