From b3c770bda2c771b9d23ebf4ed31129529416fe49 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sun, 5 Apr 2020 20:03:04 -0600 Subject: [PATCH] Prevent highlighting/selecting UI elements and mitigate if done anyways --- www/assets/css/app.css | 2 +- www/assets/js/main.js | 12 ++++++++++++ www/pages/add.html | 4 ++-- www/pages/home.html | 2 +- www/pages/list.html | 18 +++++++++--------- www/pages/settings.html | 2 +- www/pages/toolbox.html | 2 +- www/pages/toolbox/log.html | 4 ++-- www/pages/toolbox/scanner.html | 2 +- www/pages/toolbox/sharelist.html | 2 +- www/pages/toolbox/track.html | 2 +- www/pages/toolbox/weather.html | 2 +- 12 files changed, 33 insertions(+), 21 deletions(-) diff --git a/www/assets/css/app.css b/www/assets/css/app.css index f075b74..08d4b68 100644 --- a/www/assets/css/app.css +++ b/www/assets/css/app.css @@ -23,7 +23,7 @@ Framework7 and FontAwesome both have a .fab class padding-bottom: var(--f7-fab-size); } -.navbar, .item-link .item-title, .item-divider, .item-label, .noselect { +.navbar, .item-link .item-title, .item-media, .item-divider, .item-label, .fab, .button, .noselect { user-select: none; } diff --git a/www/assets/js/main.js b/www/assets/js/main.js index 8a4eb71..26b1e5f 100644 --- a/www/assets/js/main.js +++ b/www/assets/js/main.js @@ -48,6 +48,12 @@ router.on("pageInit", function (pagedata) { eval($$(this).text()); } }); + // Stop text selection from popping a system toolbar even after changing pages + if (window.getSelection) { + window.getSelection().removeAllRanges(); + } else if (document.selection) { + document.selection.empty(); + } }); /** @@ -66,6 +72,12 @@ function handleBackButton() { } else { router.back({force: true, ignoreCache: true}); } + // Stop text selection from popping a system toolbar even after changing pages + if (window.getSelection) { + window.getSelection().removeAllRanges(); + } else if (document.selection) { + document.selection.empty(); + } } $(document).keyup(function (e) { diff --git a/www/pages/add.html b/www/pages/add.html index 6144f76..b943e96 100644 --- a/www/pages/add.html +++ b/www/pages/add.html @@ -150,14 +150,14 @@
Recent Items
-
+
No recently added items! Swipe to add some.
- diff --git a/www/pages/home.html b/www/pages/home.html index 317fe2a..9001bdc 100644 --- a/www/pages/home.html +++ b/www/pages/home.html @@ -11,7 +11,7 @@
-
+
- -
-
    - -
-
+ +
+
    + +
+
diff --git a/www/pages/settings.html b/www/pages/settings.html index 97b742d..badd291 100644 --- a/www/pages/settings.html +++ b/www/pages/settings.html @@ -17,7 +17,7 @@
-
+
diff --git a/www/pages/toolbox.html b/www/pages/toolbox.html index 9c640a0..f1d8a01 100644 --- a/www/pages/toolbox.html +++ b/www/pages/toolbox.html @@ -16,7 +16,7 @@
-
+
{{#if oldui}}
diff --git a/www/pages/toolbox/log.html b/www/pages/toolbox/log.html index 9d97971..dfc80d9 100644 --- a/www/pages/toolbox/log.html +++ b/www/pages/toolbox/log.html @@ -28,7 +28,7 @@
{{#each events}}
-
{{date}} {{addldate}}
+
{{date}} {{addldate}}
{{#each entries}} @@ -44,7 +44,7 @@ {{/each}}
{{else}} -
+
Log empty! When you mark packages as delivered, add notes, and more, this log will automatically gain entries.
diff --git a/www/pages/toolbox/scanner.html b/www/pages/toolbox/scanner.html index 56772e8..ce3ddd3 100644 --- a/www/pages/toolbox/scanner.html +++ b/www/pages/toolbox/scanner.html @@ -40,7 +40,7 @@
-
+
info
Scan barcodes while your postal scanner is crashed or restarting. diff --git a/www/pages/toolbox/sharelist.html b/www/pages/toolbox/sharelist.html index 5b1ca52..449876e 100644 --- a/www/pages/toolbox/sharelist.html +++ b/www/pages/toolbox/sharelist.html @@ -57,7 +57,7 @@
-
+
info
Share your delivery list to another device. The sender uploads the list, diff --git a/www/pages/toolbox/track.html b/www/pages/toolbox/track.html index 21e606a..a99ba09 100644 --- a/www/pages/toolbox/track.html +++ b/www/pages/toolbox/track.html @@ -42,7 +42,7 @@
-
+
info
Compatible with USPS, UPS, FedEx, and DHL tracking codes. diff --git a/www/pages/toolbox/weather.html b/www/pages/toolbox/weather.html index 81d25e8..0e9b2bf 100644 --- a/www/pages/toolbox/weather.html +++ b/www/pages/toolbox/weather.html @@ -21,7 +21,7 @@
-
+