From 6ba43747d42fff06c397fa661d94031e389f4f8d Mon Sep 17 00:00:00 2001 From: Piyush Mishra Date: Mon, 5 Mar 2018 20:37:32 +0530 Subject: [PATCH] Added size limit --- web/client.js | 39 +++++++++++++++++---------------------- web/images/video.png | Bin 297 -> 0 bytes web/index.jsp | 1 - 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 web/images/video.png diff --git a/web/client.js b/web/client.js index 064b9f3..f12f196 100644 --- a/web/client.js +++ b/web/client.js @@ -58,13 +58,13 @@ window.setInterval(function() { function join(channel) { - //if (document.domain == 'uchats.herokuapp.com') { + if (document.domain == 'uchats.herokuapp.com') { ws = new WebSocket('wss://uchats.herokuapp.com/uchatsserver') - /*} + } else { // for local installs ws = new WebSocket('ws://' + location.hostname+":"+location.port + '/uchatsserver') - }*/ + } var wasConnected = false @@ -299,29 +299,18 @@ $('#footer').onclick = function() { $('#uploadimage').onchange = function() { file = this.files[0]; reader = new FileReader(); - + reader.addEventListener("load", function () { + if(file.size > 49000) + { + pushMessage({nick:'!', text:'Image must be smaller than 49000 bytes'}); + return ; + } + args = {}; args.cmd = "chat"; args.text = ''; - send(args); - }, false); - - if (file) { - reader.readAsDataURL(file); - } -} - -$('#uploadvideo').onchange = function() { - file = this.files[0]; - reader = new FileReader(); - - reader.addEventListener("load", function () { - args = {}; - args.cmd = "chat"; - args.text = ''; + args.nick = "me"; send(args); }, false); @@ -335,6 +324,12 @@ $('#uploadfile').onchange = function() { reader = new FileReader(); reader.addEventListener("load", function () { + if(file.size > 49000) + { + pushMessage({nick:'!', text:'File must be smaller than 49000 bytes'}); + return; + } + args = {}; args.cmd = "chat"; args.text = 'File: '+file.name+''; diff --git a/web/images/video.png b/web/images/video.png deleted file mode 100644 index a2e9d37a29865ffda39bac99ede6647ce5794ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`2jv5u0Z<#|NjOC2Aei*>g(&< zw{KrpS66?3|A7Mswr$(S&CPw}$Pp70lNmE+eE$5ot*tF6C}`!%m9JmFPEAdH^5lt- zkkIAJm+kEAN=iz^#lnVFfNpYP-2qoJYU;^MMo$&$Nw?Rh=@Ddga4}$&+{j^+B$#qU>4e3Crii&McR$|P h%gHCO#?jq`fkE7!G0=DG1P7pY22WQ%mvv4FO#t(AV^IJA diff --git a/web/index.jsp b/web/index.jsp index 01d326f..b7570eb 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -16,7 +16,6 @@