diff --git a/copyparty/web/browser.css b/copyparty/web/browser.css index 60a5ecdb..56ac3e28 100644 --- a/copyparty/web/browser.css +++ b/copyparty/web/browser.css @@ -2107,7 +2107,7 @@ html { width: calc(100% + 2em); } #reszbar { - position: absolute; + position: fixed; z-index: 25; top: 0; bottom: 0; @@ -2119,6 +2119,7 @@ html { cursor: ew-resize; touch-action: none; user-select: none; + transition: opacity .1s; } #reszbar:hover{ opacity: .6; diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index 28c01f41..d43cd965 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -6824,6 +6824,8 @@ function set_loaded(el, state, dblcheck) { testImage(el); return; } + if(el.parentElement == null || el.parentElement.parentElement == null) + return; var p = el.parentElement.parentElement clmod(p, 'thumbed', state) var a = p.getAttribute('ref') @@ -10996,8 +10998,8 @@ var drag = (function() { elem.ondrop = function(e) { if (!r.enabled) return; ev(e); - if(e.dataTransfer && e.dataTransfer.getData("text/plain").startsWith(window.location.origin)){ - currLink = e.dataTransfer.getData("text/plain"); + if(e.dataTransfer && e.dataTransfer.getData("text").startsWith(window.location.origin)){ + currLink = e.dataTransfer.getData("text"); console.log("elem.ondrop: " + currLink); fileman.clip = currLink.split("\n"); @@ -11039,7 +11041,7 @@ var drag = (function() { msel.selui(); } - e.dataTransfer.setData("text/plain", r.getFilesString()); + e.dataTransfer.setData("text", r.getFilesString()); } catch(ex){ console.log(e.target) @@ -11083,7 +11085,7 @@ var drag = (function() { msel.selui(); } - e.dataTransfer.setData("text/plain", r.getFilesString()); + e.dataTransfer.setData("text", r.getFilesString()); } catch(ex){ console.log(e.target) diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 240162d5..7aa50211 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -1085,7 +1085,7 @@ function up2k_init(subtle) { } } function onovercmn(self, e, btn) { - if(e.dataTransfer.getData("text/plain") && e.dataTransfer.getData("text/plain").startsWith(window.location.origin)){ + if(e.dataTransfer.getData("text") && e.dataTransfer.getData("text").startsWith(window.location.origin)){ return; } try { @@ -1194,9 +1194,9 @@ function up2k_init(subtle) { function gotfile(e) { ev(e); - console.log(e.dataTransfer.getData("text/plain")) - if(e.dataTransfer && e.dataTransfer.getData("text/plain").startsWith(window.location.origin)){ - var currLink = e.dataTransfer.getData("text/plain"); + console.log(e.dataTransfer.getData("text")) + if(e.dataTransfer && e.dataTransfer.getData("text").startsWith(window.location.origin)){ + var currLink = e.dataTransfer.getData("text"); console.log("wrap.ondrop: " + currLink); fileman.clip = currLink.split("\n");