diff options
| author | yo mama <pepper@scannerjammer.com> | 2016-10-07 15:44:20 -0700 |
|---|---|---|
| committer | yo mama <pepper@scannerjammer.com> | 2016-10-07 15:44:20 -0700 |
| commit | 87f62e156572adf0e90b9cce781f581d95998255 (patch) | |
| tree | a91d8e971857e467958be801b554c51337f0f6ae /share/frontend/im/js/main.js | |
| parent | c56370307ef7dff2a1942a5cddc327d250de5fb4 (diff) | |
fixed js
Diffstat (limited to 'share/frontend/im/js/main.js')
| -rw-r--r-- | share/frontend/im/js/main.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/share/frontend/im/js/main.js b/share/frontend/im/js/main.js index 36ae071..e1fa59e 100644 --- a/share/frontend/im/js/main.js +++ b/share/frontend/im/js/main.js @@ -1,4 +1,4 @@ -var Main = +window.Main = { API_HEADER: "#@im", generating: false, @@ -56,23 +56,27 @@ var Main = data: form, success: function(data){ Main.callback(data) }, error: function(data){ + console.log("in error") switch(data.status){ case 500: - alert("Problem with server") + Main.error("Problem with server") console.log(data) break; case 410: - alert(JSON.parse(data.responseText).message) + Main.error(JSON.parse(data.responseText).message) break; default: + Main.error("Something went wrong") console.log(data) } Main.generating = false + Main.init() } }); }, error: function (s) { + $("#result-rarr").hide() $("#output-cmd").html("<span class='error'>ERROR: " + s + "</span>").show() $("#output-url").hide() $("#output-img").hide() @@ -80,10 +84,11 @@ var Main = callback: function (data) { Main.generating = false + $("#result-rarr").show() $("#output-cmd").html("size: "+Main.filesize(data.size)+"<br/>" + data.width + " x " + data.height); - $("#output-url").val(data.url); + $("#output-url").show().val(data.url); $("#output-img").hide().attr("src", data.url).fadeIn(700) $("#sendtoinput").html(" send to input <img src=\"img/arrow_pointing_left.png\"/> ").css({"border": "1px solid gray", "cursor" : "pointer"}).click(function(){ $("#img-url").val(data.url); |
