From 7a13e8a7fc1338f8564ffa98bbab5f516f4ea92b Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sat, 14 Aug 2021 21:13:15 +0200
Subject: [PATCH] clear transform on 0deg rotate

---
 copyparty/web/baguettebox.js | 54 ++++++++++++++++++++++++++++++++----
 copyparty/web/browser.css    |  6 +++-
 copyparty/web/util.js        |  4 +--
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/copyparty/web/baguettebox.js b/copyparty/web/baguettebox.js
index 597fb7a5..b756b5bd 100644
--- a/copyparty/web/baguettebox.js
+++ b/copyparty/web/baguettebox.js
@@ -419,6 +419,7 @@ window.baguetteBox = (function () {
         unbind(overlay, 'touchmove', touchmoveHandler, passiveEvent);
         unbind(overlay, 'touchend', touchendHandler);
         unbind(document, 'focus', trapFocusInsideOverlay, true);
+        timer.rm(rotn);
     }
 
     function prepareOverlay(gallery, userOptions) {
@@ -669,18 +670,31 @@ window.baguetteBox = (function () {
         return true;
     }
 
+    var prev_cw = 0, prev_ch = 0, unrot_timer = null;
     function rotn(n) {
         var el = vidimg(),
             orot = parseInt(el.getAttribute('rot') || 0),
-            frot = orot + n * 90,
-            rot = frot,
+            frot = orot + (n || 0) * 90;
+
+        if (!frot && !orot)
+            return;  // reflow noop
+
+        var co = ebi('bbox-overlay'),
+            cw = co.clientWidth,
+            ch = co.clientHeight;
+
+        if (!n && prev_cw === cw && prev_ch === ch)
+            return;  // reflow noop
+
+        prev_cw = cw;
+        prev_ch = ch;
+        var rot = frot,
             iw = el.naturalWidth || el.videoWidth,
             ih = el.naturalHeight || el.videoHeight,
             magic = 4,  // idk, works in enough browsers
-            co = ebi('bbox-overlay'),
             dl = el.closest('div').querySelector('figcaption a'),
-            vw = co.clientWidth,
-            vh = co.clientHeight - dl.offsetHeight + magic,
+            vw = cw,
+            vh = ch - dl.offsetHeight + magic,
             pmag = Math.min(1, Math.min(vw / ih, vh / iw)),
             wmag = Math.min(1, Math.min(vw / iw, vh / ih));
 
@@ -703,6 +717,11 @@ window.baguetteBox = (function () {
         el.style.top = (vh - ih * mag) / 2 - magic + 'px';
         el.style.transform = 'rotate(' + frot + 'deg)';
         el.setAttribute('rot', frot);
+        timer.add(rotn);
+        if (!rot) {
+            clearTimeout(unrot_timer);
+            unrot_timer = setTimeout(unrot, 300);
+        }
     }
     function rotl() {
         rotn(-1);
@@ -710,6 +729,23 @@ window.baguetteBox = (function () {
     function rotr() {
         rotn(1);
     }
+    function unrot() {
+        var el = vidimg(),
+            orot = el.getAttribute('rot'),
+            rot = parseInt(orot || 0);
+
+        while (rot < 0) rot += 360;
+        while (rot >= 360) rot -= 360;
+        if (rot || orot === null)
+            return;
+
+        el.classList.add('nt');
+        el.removeAttribute('rot');
+        el.removeAttribute("style");
+        rot = el.offsetHeight;
+        el.classList.remove('nt');
+        timer.rm(rotn);
+    }
 
     function vid() {
         return imagesElements[currentIndex].querySelector('video');
@@ -781,11 +817,17 @@ window.baguetteBox = (function () {
         mp_ctl();
         setVmode();
 
+        var el = vidimg();
+        if (el.getAttribute('rot'))
+            timer.add(rotn);
+        else
+            timer.rm(rotn);
+
         var prev = QS('.full-image.vis');
         if (prev)
             prev.classList.remove('vis');
 
-        vidimg().closest('div').classList.add('vis');
+        el.closest('div').classList.add('vis');
     }
 
     function preloadNext(index) {
diff --git a/copyparty/web/browser.css b/copyparty/web/browser.css
index fc255d1f..6d16906b 100644
--- a/copyparty/web/browser.css
+++ b/copyparty/web/browser.css
@@ -1328,7 +1328,11 @@ html.light #tree::-webkit-scrollbar {
 	max-height: calc(100% - 1.4em);
 	margin-bottom: 1.4em;
 	vertical-align: middle;
-	transition: transform .2s, left .2s, top .2s, width .2s, height .2s;
+	transition: transform .23s, left .23s, top .23s, width .23s, height .23s;
+}
+.full-image img.nt,
+.full-image video.nt {
+	transition: none;
 }
 .full-image.vis img,
 .full-image.vis video {
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index 2205d512..242a63f4 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -494,7 +494,7 @@ var timer = (function () {
         apop(r.q, fun);
     };
 
-    function impl() {
+    function doevents() {
         if (Date.now() - r.last < 69)
             return;
 
@@ -504,7 +504,7 @@ var timer = (function () {
 
         r.last = Date.now();
     }
-    setInterval(impl, 100);
+    setInterval(doevents, 100);
 
     return r;
 })();