Skip to content

Commit

Permalink
Fixed progress bar and other things
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel on umini committed Apr 17, 2015
1 parent 4a198f1 commit f8b0123
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
6 changes: 6 additions & 0 deletions download.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
}
elseif($paths[0] == "delete")
{
header("Content-type: text/html; charset=utf-8");
header("Expires: on, 01 Jan 1970 00:00:00 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
if(json_decode(file_get_contents("features"))->deleting == true)
{
@$f = basename($paths[1]);
Expand Down
12 changes: 6 additions & 6 deletions functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ function upload(binary,fname,date)
i.style.maxWidth = "19%";
i.style.minWidth = "200px";
grid.appendChild(i);
if(isset(i.y) && typeof window.scrollTo == "function") window.scrollTo(0,i.y);
if(typeof window.scrollTo == "function") window.scrollTo(0,$(i).offset().top);
var xmlhttp = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP");
xmlhttp.addEventListener("readystatechange",function()
{
Expand Down Expand Up @@ -644,8 +644,8 @@ function kinput(e)
if(kk == 105) infooverlay();
if(kk == 102) fs();
if(kk == 27) {e.preventDefault(); container.click();}
if(kk == 39) next();
if(kk == 37) prev();
if(kk == 39 || kk == 110) next();
if(kk == 37 || kk == 112) prev();
if(kk == 8 || kk == 46){ e.preventDefault(); del();}
}
function addimg(image)
Expand Down Expand Up @@ -714,11 +714,11 @@ function openpic(srcthumb)
var d = $(srcthumb).data();
if("by" in d)
{
by = meta['all'] != undefined ? meta['all'] : "Unknown";
by = d.by;
}
else
{
by = d.by;
by = meta['all'] != undefined ? meta['all'] : "Unknown";
}
if("description" in d)
{
Expand Down Expand Up @@ -1287,7 +1287,7 @@ infolay.classList.add("closed");
container.appendChilds(prevb,nextb,img,infobut,infolay);
function init()
{
document.body.appendChilds(grid,container);
document.body.appendChilds(prog,grid,container);
document.querySelector(".fileUpload").style.display = "";
imgs.forEach(addimg);
ety();
Expand Down
Loading

0 comments on commit f8b0123

Please sign in to comment.