summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Whalan <ewhal@pantsu.cat>2016-07-04 08:28:48 +0200
committerEliot Whalan <ewhal@pantsu.cat>2016-07-04 08:28:48 +0200
commit5355335bee5bbd3b6e36c16542d29332ff28a7ea (patch)
tree419ded0bba906241605bba89e867862fb9b6990b
parent5b3823a496b72cefb0042295d3a0fd4fbedcfc22 (diff)
parent64ae314ea811d6d30e49a76ddf895ef55419fd72 (diff)
Merge branch 'master' of github.com:pomf/pomf
-rw-r--r--Makefile2
-rw-r--r--README.md2
m---------php0
-rw-r--r--static/js/app.js3
4 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1d4d553..e3fa0c0 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ endif
copy-moe:
ifneq ($(wildcard $(CURDIR)/moe/.),)
- cp -rv $(CURDIR)/moe $(CURDIR)/build/moe
+ cp -rv $(CURDIR)/moe $(CURDIR)/build/
else
$(error The moe submodule was not found)
endif
diff --git a/README.md b/README.md
index b5710f9..979ea0f 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Pomf is a simple file uploading and sharing platform.
### Demo
-See the real world example at [Pantsu.cat](https://pantsu.cat/).
+See the real world example at [try.pantsu.cat](https://try.pantsu.cat/).
## Requirements
diff --git a/php b/php
-Subproject 5abbc323d7f64df5fcf16255db79de339dc7256
+Subproject 74d9ece4e8cb9a8f5311fbfe995427935d2659e
diff --git a/static/js/app.js b/static/js/app.js
index 5b1ddec..0215599 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -97,6 +97,7 @@ document.addEventListener('DOMContentLoaded', function () {
link.appendChild(element);
var range = document.createRange();
range.selectNode(element);
+ window.getSelection().removeAllRanges();
window.getSelection().addRange(range);
document.execCommand("copy");
link.removeChild(element);
@@ -117,7 +118,7 @@ document.addEventListener('DOMContentLoaded', function () {
var bar = row.querySelector('.file-progress');
var percentIndicator = row.querySelector('.progress-percent');
var xhr = new XMLHttpRequest();
- xhr.open('POST', '/upload.php');
+ xhr.open('POST', 'upload.php');
xhr['row'] = row;
xhr['bar'] = bar;