From b9cce7e42949a0f524ffd3623464066d62246c97 Mon Sep 17 00:00:00 2001 From: ishadurin Date: Tue, 31 May 2016 00:01:03 +0300 Subject: [PATCH] change browser history after delete or upload photo --- swarm/examples/album/file-manager.js | 2 +- swarm/examples/album/index.js | 64 +++++++++++++++------------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/swarm/examples/album/file-manager.js b/swarm/examples/album/file-manager.js index edb4000f78..046ffb011d 100644 --- a/swarm/examples/album/file-manager.js +++ b/swarm/examples/album/file-manager.js @@ -103,7 +103,7 @@ function onUploadingComplete(uri) { xhr.onreadystatechange = function () { if (xhr.readyState === 4) { var i = xhr.responseText; - window.location.replace("/bzz:/" + i + "/"); + window.location = "/bzz:/" + i + "/" + window.location.hash; } }; sendImages(xhr, uri); diff --git a/swarm/examples/album/index.js b/swarm/examples/album/index.js index 9f5949073b..53e9b54f76 100644 --- a/swarm/examples/album/index.js +++ b/swarm/examples/album/index.js @@ -273,41 +273,45 @@ function imageToUrl(img, w, h) { return can.toDataURL(); } -function deleteImg() -{ - if(imgs.data.length < 2) return; // empty albums not allowed - var fname = imgs.data[eidx].img[0]; - imgs.data.splice(eidx,1); +function deleteImg() { + if (imgs.data.length < 2) return; // empty albums not allowed + var fname = imgs.data[eidx].img[0]; + imgs.data.splice(eidx, 1); - // construct an HTTP request - var xhr = new XMLHttpRequest(); + // construct an HTTP request + var xhr = new XMLHttpRequest(); - // set response handler - xhr.onreadystatechange = function () { if (xhr.readyState === 4) { - var i = xhr.responseText; - var xhrd = new XMLHttpRequest(); - xhrd.onreadystatechange = function () { if (xhrd.readyState === 4) { - var j = xhrd.responseText; - window.location.replace("/bzz:/" + j + "/"); - }}; - xhrd.open("DELETE", "/bzz%3A/" + i + "/" + fname, true); - xhrd.send(); - }}; + // set response handler + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + var i = xhr.responseText; + var xhrd = new XMLHttpRequest(); + xhrd.onreadystatechange = function () { + if (xhrd.readyState === 4) { + var j = xhrd.responseText; + window.location = "/bzz:/" + j + "/" + window.location.hash; + } + }; + xhrd.open("DELETE", "/bzz%3A/" + i + "/" + fname, true); + xhrd.send(); + } + }; - sendImages(xhr, ""); + sendImages(xhr, ""); } -function moveUpDown(off) -{ - var me = imgs.data[eidx]; - imgs.data[eidx] = imgs.data[eidx + off]; - imgs.data[eidx + off] = me; - var xhr = new XMLHttpRequest(); - xhr.onreadystatechange = function () { if (xhr.readyState === 4) { - var i = xhr.responseText; - window.location.replace("/bzz:/" + i + "/#" + (eidx + off)); - }}; - sendImages(xhr, ""); +function moveUpDown(off) { + var me = imgs.data[eidx]; + imgs.data[eidx] = imgs.data[eidx + off]; + imgs.data[eidx + off] = me; + var xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + var i = xhr.responseText; + window.location.replace("/bzz:/" + i + "/#" + (eidx + off)); + } + }; + sendImages(xhr, ""); } function moveUp()