+
-
+
+
diff --git a/static/js/app.js b/static/js/app.js
index 2edb6bd..4a099bc 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -15,10 +15,13 @@ var vayakti = {};
var typing = [];
var no_name_message = false;
-// Connection opened
-socket.addEventListener('open', function (event) {
- $('#progress_button').removeClass('is-hidden');
+// check if support ws
+if(!('WebSocket' in window || 'MozWebSocket' in window)) {
+ $('initerror').text('Warning: Web Browser dosen\'t support websocket! Upgrade');
+}
+// Connection opened
+socket.onopen = function(event) {
var params = window.location.search;
params = params.substr(1,params.length).split('&');
@@ -31,12 +34,18 @@ socket.addEventListener('open', function (event) {
frm.find('[name=kaksh_kunjika]').val(params[0]);
frm.find('[name=kunjika]').val(params[1]);
frm.find('[name=name]').val(params[2]);
-
+ $('#progress_button').css('display', '');
connect(frm);
-});
+}
+
+// Connection fail
+socket.onerror = function(event) {
+ $('initerror').text('Warning: Failed to connect websocket! Refresh the '+
+ 'page and if still don\'t work upgrade Web Browser');
+}
// Listen for messages
-socket.addEventListener('message', function (event) {
+socket.onmessage = function(event) {
var j = JSON.parse(event.data);
switch(j.cmd) {
case 'resp':
@@ -100,13 +109,13 @@ socket.addEventListener('message', function (event) {
});
break;
}
-});
+}
function connect(frm) {
if(actions.has_key('join') || actions.has_key('leave')) return;
var frm = $(frm);
var data = {};
- frm.serializeArray().forEach(el => {
+ frm.serializeArray().forEach(function(el) {
if(typeof el.value == 'string')
data[el.name] = el.value.trim();
else
@@ -204,7 +213,7 @@ function changeColor() {
function refreshVayaktiList() {
var v = $('#vayakti_list');
v.empty();
- Object.keys(vayakti).forEach((key) => {
+ Object.keys(vayakti).forEach(function(key) {
v.append($('
')
.append($('| ').append(vayakti[key]))
.append($(' | ').append(key)));
@@ -216,6 +225,6 @@ function autosize(el){
el.style.cssText = 'height:auto; padding:0';
el.style.cssText = 'height:' + el.scrollHeight + 'px';
$('#reply_clip').css('bottom', (el.scrollHeight + 10) + 'px');
- $('#selected_clip').css('bottom', (el.scrollHeight + 10) + 'px');
+ $('#selected_clip').css('bottom', (el.scrollHeight + 25) + 'px');
},0);
}
\ No newline at end of file
diff --git a/static/js/camera.js b/static/js/camera.js
index 5793982..856fd27 100644
--- a/static/js/camera.js
+++ b/static/js/camera.js
@@ -1,6 +1,6 @@
var Camera = class {
static setupCamera() {
- $('#file-input')[0].addEventListener('change', (e) => {
+ $('#file-input')[0].addEventListener('change', function(e) {
const file = e.target.files[0];
if (!file) {
return;
@@ -19,11 +19,14 @@ var Camera = class {
reader.readAsDataURL(result);
reader.onloadend = function() {
var base64data = reader.result;
- if(base64data.length > 63000 && mime != 'image/jpeg') {
+ if(base64data.length > 63488 && mime != 'image/jpeg') {
base64data = null;
result = null;
Camera.compressImage(file, 0.7, 'image/jpeg');
return;
+ } else if(base64data.length > 63488 && mime == 'image/jpeg') {
+ window.alert('file is too large!');
+ return;
}
socket.send(JSON.stringify({
diff --git a/static/js/message.js b/static/js/message.js
index 957eb0d..1aa37a2 100644
--- a/static/js/message.js
+++ b/static/js/message.js
@@ -4,7 +4,7 @@ let Messages = class {
var elm = $(elm);
elm.toggleClass('active');
- if($('.active').length == 0)
+ if($('.message.active').length == 0)
$('#selected_clip').addClass('is-hidden');
else
$('#selected_clip').removeClass('is-hidden');
@@ -49,7 +49,7 @@ let Messages = class {
if(elm.length > 0) elm.remove();
if(typing.length == 0) return;
var text = '';
- typing.forEach((val) => {
+ typing.forEach(function(val) {
var name = vayakti[val];
if(name == undefined) name = "";
text += name+'('+val.substr(0,8)+')'+ ','
@@ -98,7 +98,7 @@ let Messages = class {
else
elm.append($('', {class: 'message-by'}).append(vayakti[sender]+'('+sender.substr(0, 8)+')'))
}
- elm.append($(' ![]() ', {src: src}));
+ elm.append($(' ![]() ', {src: src, width: 300}));
elm.click(function() {
Messages.pick(this);
});
diff --git a/static/js/onload.js b/static/js/onload.js
index 2a474c3..733dfb0 100644
--- a/static/js/onload.js
+++ b/static/js/onload.js
@@ -2,7 +2,7 @@ if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').match
$('body').toggleClass('dark');
}
-$(document).ready(() => {
+$(document).ready(function() {
$(".tabs > a").click(function() {
var t = $(this);
|