From 50bf754c8742a5b7d054b9d93f9d4e37c1641a01 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Thu, 10 Sep 2020 14:35:15 +0200
Subject: use native scrolling!! wooo!!! no more fastclick OR iscroll!! bye bye
 2015!!!!

---
 StoneIsland/www/css/blogs.css               | 5 +++--
 StoneIsland/www/css/index.css               | 1 +
 StoneIsland/www/css/vendor/imageviewer.css  | 2 +-
 StoneIsland/www/index.html                  | 4 +++-
 StoneIsland/www/js/lib/etc/accessibility.js | 3 ++-
 StoneIsland/www/js/lib/etc/scroll.js        | 9 +++++----
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index ee54a31f..f56ec474 100755
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/www/css/blogs.css
@@ -36,7 +36,8 @@
   text-decoration: underline;
 }
 #story .content > div {
-  display:none;
+  display: none;
+  padding-bottom: env(safe-area-inset-bottom);
 }
 #story .content div.active {
   display:block;
@@ -340,7 +341,7 @@ ul.links {
 
 #archive .scroll {
   top: 0; left: 0;
-  height: calc(100% - 125px);
+  height: 100%;
 }
 #archive .row:first-of-type {
   margin-top: 7em;
diff --git a/StoneIsland/www/css/index.css b/StoneIsland/www/css/index.css
index d4336438..496a0ee4 100755
--- a/StoneIsland/www/css/index.css
+++ b/StoneIsland/www/css/index.css
@@ -59,6 +59,7 @@ a, a:visited {
 }
 .vscroll .scroll {
   width: 100%;
+  overflow-x: hidden;
 /*  height: calc(100vh - 2.5rem);
   overflow: scroll;
   -webkit-overflow-scrolling: touch;
diff --git a/StoneIsland/www/css/vendor/imageviewer.css b/StoneIsland/www/css/vendor/imageviewer.css
index 739c37a1..90d80fde 100644
--- a/StoneIsland/www/css/vendor/imageviewer.css
+++ b/StoneIsland/www/css/vendor/imageviewer.css
@@ -26,7 +26,7 @@
   height: 48px;
   position: fixed;
   right: 20px;
-  top: 20px;
+  top: calc(20px + env(safe-area-inset-top));
   cursor: pointer;
   text-align: center;
   overflow: hidden;
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 1fee338c..46c79c98 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -122,7 +122,9 @@
   <div id="story" role="region" aria-label="Stone Island Story">
     <div class="scroll">
       <h1 role="menuitem" aria-label="Current section: Stone Island Story">STORY</h1>
-      <img>
+      <div>
+        <img>
+      </div>
       <ul class="links"></ul>
       <div class="content">
         <script type="text/html" class="template">
diff --git a/StoneIsland/www/js/lib/etc/accessibility.js b/StoneIsland/www/js/lib/etc/accessibility.js
index a18ad5b3..c91582f0 100644
--- a/StoneIsland/www/js/lib/etc/accessibility.js
+++ b/StoneIsland/www/js/lib/etc/accessibility.js
@@ -1,4 +1,5 @@
 var accessibility = (function() {
+        $('html').addClass('vscroll')
 
   var accessibility = {}
   accessibility.voiceOver = false
@@ -43,7 +44,7 @@ var accessibility = (function() {
         $("html").addClass('accessible')
         $('html').addClass('vscroll')
       } else {
-        $('html').addClass('iscroll')
+        // $('html').addClass('iscroll')
       }
       ready()
     })
diff --git a/StoneIsland/www/js/lib/etc/scroll.js b/StoneIsland/www/js/lib/etc/scroll.js
index 253921e1..51e14a01 100644
--- a/StoneIsland/www/js/lib/etc/scroll.js
+++ b/StoneIsland/www/js/lib/etc/scroll.js
@@ -22,8 +22,9 @@ function NativeScroll(el) {
 }
 
 function ScrollFactory (el, opt) {
-  if (accessibility.voiceOver) {
-    return NativeScroll(el)
-  }
-  return new IScroll(el, opt)
+  return NativeScroll(el)
+  // if (accessibility.voiceOver) {
+  //   return NativeScroll(el)
+  // }
+  // return new IScroll(el, opt)
 }
-- 
cgit v1.2.3-70-g09d2