Merge branch 'master' of https://g.3d3.ca/scm/up/upload

index.html

@@ -130,7 +130,11 @@
             color: white;
             opacity: .75;
             z-index: 1;
-            word-wrap: break-word;
+            max-width: 100%;
+            box-sizing: border-box;
+            -moz-box-sizing: border-box;
+            white-space: nowrap;
+            overflow: hidden;
         }
 
         #btnarea, #globalbtnarea {

static/js/drop.js

@@ -93,20 +93,17 @@ $(function () {
 
     g.focusPaste = function () {
         setTimeout(function () {
-            pasteCatcher.focus();
-            pasteCatcher.click()
+            pasteCatcher.focus()
         }, 100);
     }
 
     $(document).on('click', function (e) {
-        if (e.target == document.body) {
+        if (e.target == document.body && pastearea.is(':visible')) {
             e.preventDefault()
             g.focusPaste();
         }
     })
 
-    g.focusPaste();
-
 
     $(document).on('paste', function (e) {
         if (!pastearea.is(':visible')) {

static/js/encryption.js

@@ -34,10 +34,6 @@ function encrypt(file, seed, id) {
     })
 }
 
-function decode_utf8(s) {
-    return decodeURIComponent(escape(s));
-}
-
 function decrypt(file, seed, id) {
     var params = parameters(seed)
     var uarr = new Uint8Array(file)