paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code format

Browse Source
This commit is contained in:
Paul Schneider
2019-08-23 22:23:26 +01:00
parent 4355f3d067
commit a249b65a37
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Yavsc/wwwroot/js/chat.js
View File

@ -104,19 +104,17 @@ window.ChatHubHandler = (function ($) {
} }
$('<li></li>').append(tag + ': ' + targetid + ': ').append(message).addClass(tag).appendTo(notifications); $('<li></li>').append(tag + ': ' + targetid + ': ').append(message).addClass(tag).appendTo(notifications);
}; };
chat.client.notifyUserInRoom = function (tag, room, message) { chat.client.notifyUserInRoom = function (tag, room, message) {
$('<li></li>').append(tag + ': ' ).append(message).addClass(tag).appendTo($('#room_' + room)); $('<li></li>').append(tag + ': ').append(message).addClass(tag).appendTo($('#room_' + room));
}; };
chat.client.addPublicStream = function (pubStrInfo) chat.client.addPublicStream = function (pubStrInfo) {
{
$('<li></li>').append(pubStrInfo.sender + ': ') $('<li></li>').append(pubStrInfo.sender + ': ')
.append('<a href="'+pubStrInfo.url+'">'+pubStrInfo.title+'</a>').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications); .append('<a href="' + pubStrInfo.url + '">' + pubStrInfo.title + '</a>').append('[' + pubStrInfo.mediaType + ']').addClass('streaminfo').appendTo(notifications);
}; };
chat.client.push = function (what, data) chat.client.push = function (what, data) {
{
$('<li></li>').append(what + ': ') $('<li></li>').append(what + ': ')
.append(data.event).addClass('event').appendTo(notifications); .append(data.event).addClass('event').appendTo(notifications);
}; };
@ -125,7 +123,7 @@ window.ChatHubHandler = (function ($) {
if (chanInfo) { if (chanInfo) {
var chanId = 'r' + chanInfo.Name; var chanId = 'r' + chanInfo.Name;
$('#tv_' + chanId).replaceWith(chanInfo.Topic); $('#tv_' + chanId).replaceWith(chanInfo.Topic);
} }
}; };
var setActiveChan = function (chanId) { var setActiveChan = function (chanId) {
@ -141,12 +139,11 @@ window.ChatHubHandler = (function ($) {
} }
}; };
var join = function (roomName) var join = function (roomName) {
{
chat.server.join(roomName).done(function (chatInfo) { chat.server.join(roomName).done(function (chatInfo) {
if (chatInfo) { if (chatInfo) {
setChanInfo(chatInfo); setChanInfo(chatInfo);
setActiveChan('r'+chatInfo.Name); setActiveChan('r' + chatInfo.Name);
} }
}); });
}; };
@ -158,7 +155,6 @@ window.ChatHubHandler = (function ($) {
var roomlist = $('<div class="roomlist"></div>'); var roomlist = $('<div class="roomlist"></div>');
roomlist.appendTo(chatbar); roomlist.appendTo(chatbar);
var ptc = $('<img src="/images/ptcroix.png" >').addClass('ptcroix'); var ptc = $('<img src="/images/ptcroix.png" >').addClass('ptcroix');
$('<label for="channame">Join&nbsp;:</label>') $('<label for="channame">Join&nbsp;:</label>')
.appendTo(roomjoin); .appendTo(roomjoin);
var chanName = $('<input id="channame" title="channel name" hint="yavsc" >'); var chanName = $('<input id="channame" title="channel name" hint="yavsc" >');
@ -206,15 +202,16 @@ window.ChatHubHandler = (function ($) {
}; };
var buildRoom = function (roomName) { var buildRoom = function (roomName) {
if (!chans.some(function(cname) { return cname == roomName; })) if (!chans.some(function(cname) { return cname == roomName; })) {
buildChan('#', 'r', roomName, chat.server.send); buildChan('#', 'r', roomName, chat.server.send);
}
}; };
var DestroyRoom = function () { var DestroyRoom = function () {
if (frontChanId) { if (frontChanId) {
$('#v' + frontChanId).remove(); $('#v' + frontChanId).remove();
$('#sel_' + frontChanId).remove(); $('#sel_' + frontChanId).remove();
frontChanId=null; frontChanId = null;
} }
} }
@ -233,7 +230,7 @@ window.ChatHubHandler = (function ($) {
}); });
}); });
};*/ };*/
$view.data('chans').split(',').forEach(function (chan){ $view.data('chans').split(',').forEach(function (chan) {
buildRoom(chan); buildRoom(chan);
}); });
@ -264,7 +261,7 @@ window.ChatHubHandler = (function ($) {
}); });
}, 30000); // Re-start connection after 30 seconds }, 30000); // Re-start connection after 30 seconds
}); });
chanName.keydown(function (event) { chanName.keydown(function (event) {
if (event.which == 13) { if (event.which == 13) {
if (this.value.length == 0) return; if (this.value.length == 0) return;
@ -275,7 +272,7 @@ window.ChatHubHandler = (function ($) {
// else TODO showRoomInfo(this.value); // else TODO showRoomInfo(this.value);
}); });
ptc.click(function(){ ptc.click(function() {
DestroyRoom(); DestroyRoom();
}); });
@ -309,8 +306,7 @@ window.ChatHubHandler = (function ($) {
return encodedValue; return encodedValue;
} }
// FIXME cx clean shutdown $(window).unload(function () { $.connection.hub.abort() });
// $(window).unload(function () { });
}; };

10
src/Yavsc/wwwroot/js/chat.min.js vendored
View File

@ -0,0 +1,10 @@
window.ChatHubHandler=(function($){$.fn.filterByData=function(prop,val){return this.filter(function(){return $(this).data(prop)==val;});};var ChatView=function($view,full){if(!full)throw new Error('not implemented');var chans=[];var userlist=[];var frontChanId;var ulist=$('<ul></ul>').addClass('userlist');var notifications=$('<ul></ul>').addClass('notifs');ulist.appendTo($view);notifications.appendTo($view);var onUserDisconnected=function(uname){$('#u'+uname).remove();};var onUserConnected=function(username){addChatUser(username);};var chat=$.connection.chatHub;chat.client.addMessage=function(name,room,message){var $userTag=$('<a>'+htmlEncode(name)+'</a>').click(function(){buildPv(name);});var $li=$('<li class="discussion"></li>');$userTag.appendTo($li);$li.append(' '+htmlEncode(message));$li.appendTo($('#r'+room));};chat.client.addPV=function(name,message){if(!$('#mute').prop('checked')){audio.play();}
buildPv(name);$('#u'+name).append('<li class="pv"><strong>'+htmlEncode(name)+'</strong>: '+htmlEncode(message)+'</li>');};chat.client.notifyRoom=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
$('<li></li>').addClass(tag).append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+targetid));};chat.client.notifyUser=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
$('<li></li>').append(tag+': '+targetid+': ').append(message).addClass(tag).appendTo(notifications);};chat.client.notifyUserInRoom=function(tag,room,message){$('<li></li>').append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+room));};chat.client.addPublicStream=function(pubStrInfo){$('<li></li>').append(pubStrInfo.sender+': ').append('<a href="'+pubStrInfo.url+'">'+pubStrInfo.title+'</a>').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);};chat.client.push=function(what,data){$('<li></li>').append(what+': ').append(data.event).addClass('event').appendTo(notifications);};var setChanInfo=function(chanInfo){if(chanInfo){var chanId='r'+chanInfo.Name;$('#tv_'+chanId).replaceWith(chanInfo.Topic);}};var setActiveChan=function(chanId){if(frontChanId!=chanId){if(frontChanId){$('#sel_'+frontChanId).addClass('btn-primary');$('#v'+frontChanId).addClass('hidden');}
frontChanId=chanId;$('#sel_'+chanId).removeClass('btn-primary');$('#v'+chanId).removeClass('hidden');$('#inp_'+chanId).focus();}};var join=function(roomName){chat.server.join(roomName).done(function(chatInfo){if(chatInfo){setChanInfo(chatInfo);setActiveChan('r'+chatInfo.Name);}});};var chatbar=$('<div class="chatbar form-group"></div>');var roomjoin=$('<div class="chatctl" ></div>');var roomlist=$('<div class="roomlist"></div>');roomlist.appendTo(chatbar);var ptc=$('<img src="/images/ptcroix.png" >').addClass('ptcroix');$('<label for="channame">Join&nbsp;:</label>').appendTo(roomjoin);var chanName=$('<input id="channame" title="channel name" hint="yavsc" >');chanName.appendTo(roomjoin);ptc.appendTo(roomjoin);roomjoin.appendTo(chatbar);chatbar.appendTo($view);var chatlist=$('<div class="chatlist" ></div>');chatlist.appendTo($view);var buildChan=function(chdp,chanType,chanName,sendCmd){var chanId=chanType+chanName;var roomTag=$('<a>'+chdp+chanName+'</a>').addClass('btn');roomTag.prop('id','sel_'+chanId).click(function(){setActiveChan(chanId);$(this).removeClass('btn-primary');});roomTag.appendTo(roomlist);var roomview=$('<div></div>').addClass('container');roomview.appendTo(chatlist);roomview.prop('id','v'+chanId);$('<div></div>').prop('id','tv_'+chanId).appendTo(roomview);var msglist=$('<ul></ul>').addClass('mesglist');msglist.prop('id',chanId);msglist.appendTo(roomview);$('<input type="text">').prop('id','inp_'+chanId).prop('enable',false).prop('hint','hello').prop('title','send to '+chanName).addClass('form-control').keydown(function(ev){if(ev.which==13){if(this.value.length==0)return;sendCmd(chanName,this.value);this.value='';}}).appendTo(roomview);if(chanType=='r')chans.push(chanName);else if(chanType=='u'||chanType=='a')userlist.push(chanName);setActiveChan(chanId);};var buildRoom=function(roomName){if(!chans.some(function(cname){return cname==roomName;})){buildChan('#','r',roomName,chat.server.send);}};var DestroyRoom=function(){if(frontChanId){$('#v'+frontChanId).remove();$('#sel_'+frontChanId).remove();frontChanId=null;}}
var buildPv=function(userName){if(!userlist.some(function(uname){return uname==userName;})){if(userName[0]=='?')buildChan('@?','a',userName.slice(1),chat.server.sendPV);else buildChan('@','u',userName,chat.server.sendPV);}};$view.data('chans').split(',').forEach(function(chan){buildRoom(chan);});function onCx(){$view.removeClass('disabled');setTimeout(function(){chans.forEach(function(chan){join(chan);});},120);}
function onDisCx(){$view.addClass('disabled');}
$.connection.hub.start().done(function(){onCx();});$.connection.hub.disconnected(function(){onDisCx();setTimeout(function(){$.connection.hub.start().done(function(){onCx();});},30000);});chanName.keydown(function(event){if(event.which==13){if(this.value.length==0)return;buildRoom(this.value);join(this.value);this.value='';}});ptc.click(function(){DestroyRoom();});var audio=new Audio('/sounds/bell.mp3');$('#command').keydown(function(event){if(event.which==13){}});var addChatUser=function(uname){$('#u_'+uname).remove();$('<li class="user"><img src="/Avatars/'+uname+'.xs.png"> '+uname+'</li>').prop('id','u_'+uname).css('cursor','pointer').click(function(){buildPv(uname);}).appendTo(ulist);};function htmlEncode(value){var encodedValue=$('<div />').text(value).html();return encodedValue;}
$(window).unload(function(){$.connection.hub.abort()});};$(document).ready(function($){ChatView($('#chatview'),true);});})(window.jQuery);