From 59537c18f362514ec51477aa3988889cef538048 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Mon, 19 Aug 2024 13:10:04 +0100 Subject: [PATCH 1/4] Display text in modal instead of alert, to improve things on iOS --- resources/js/app.js | 5 ++++- resources/views/layout.blade.php | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/resources/js/app.js b/resources/js/app.js index 6b2d687571b..9122b794c74 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -211,6 +211,8 @@ Statamic.app({ portals: [], appendedComponents: [], isLicensingBannerSnoozed: localStorage.getItem(`statamic.snooze_license_banner`) > new Date().valueOf(), + copyToClipboardModalOpen: false, + copyToClipboardUrl: null, }, computed: { @@ -257,7 +259,8 @@ Statamic.app({ await navigator.clipboard.writeText(url); Statamic.$toast.success(__('Copied to clipboard')); } catch (err) { - await alert(url); + Statamic.$app.copyToClipboardModalOpen = true; + Statamic.$app.copyToClipboardUrl = url; } }); diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index 9c573f6517b..e27ff5f5cc4 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -38,6 +38,18 @@ class="@yield('content-class')" v-on="component.events" > + +
+ +
+
+ From 8d1407f6029cb77b8d1bbdf0a257f4bea7726575 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 19 Aug 2024 09:59:05 -0400 Subject: [PATCH 2/4] var --- resources/js/app.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 9122b794c74..19adbbf307b 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -251,6 +251,7 @@ Statamic.app({ }, created() { + const app = this; const state = localStorage.getItem('statamic.nav') || 'open'; this.navOpen = state === 'open'; @@ -259,8 +260,8 @@ Statamic.app({ await navigator.clipboard.writeText(url); Statamic.$toast.success(__('Copied to clipboard')); } catch (err) { - Statamic.$app.copyToClipboardModalOpen = true; - Statamic.$app.copyToClipboardUrl = url; + app.copyToClipboardModalOpen = true; + app.copyToClipboardUrl = url; } }); From fa9adc3551da04b470aeaebf01444c8a08897200 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 19 Aug 2024 10:00:49 -0400 Subject: [PATCH 3/4] one variable is enough --- resources/js/app.js | 6 ++---- resources/views/layout.blade.php | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 19adbbf307b..40cfdd4f7ce 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -211,8 +211,7 @@ Statamic.app({ portals: [], appendedComponents: [], isLicensingBannerSnoozed: localStorage.getItem(`statamic.snooze_license_banner`) > new Date().valueOf(), - copyToClipboardModalOpen: false, - copyToClipboardUrl: null, + copyToClipboardModalUrl: null, }, computed: { @@ -260,8 +259,7 @@ Statamic.app({ await navigator.clipboard.writeText(url); Statamic.$toast.success(__('Copied to clipboard')); } catch (err) { - app.copyToClipboardModalOpen = true; - app.copyToClipboardUrl = url; + app.copyToClipboardModalUrl = url; } }); diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index e27ff5f5cc4..09e0c20fb30 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -39,14 +39,14 @@ class="@yield('content-class')" >
- +
From dc1bc7d2f6e2882710b52dfc05ef926d7a5068bb Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 19 Aug 2024 10:01:16 -0400 Subject: [PATCH 4/4] no point making it copyable. thats why this modal exists. --- resources/views/layout.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index 09e0c20fb30..4e69fe6d298 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -46,7 +46,7 @@ class="@yield('content-class')" @confirm="copyToClipboardModalUrl = null" >
- +