diff --git a/src/Yavsc/wwwroot/js/chat.js b/src/Yavsc/wwwroot/js/chat.js
index 7d2d30c1..8ec4dac0 100644
--- a/src/Yavsc/wwwroot/js/chat.js
+++ b/src/Yavsc/wwwroot/js/chat.js
@@ -104,19 +104,17 @@ window.ChatHubHandler = (function ($) {
}
$('
').append(tag + ': ' + targetid + ': ').append(message).addClass(tag).appendTo(notifications);
};
-
+
chat.client.notifyUserInRoom = function (tag, room, message) {
- $(' ').append(tag + ': ' ).append(message).addClass(tag).appendTo($('#room_' + room));
+ $(' ').append(tag + ': ').append(message).addClass(tag).appendTo($('#room_' + room));
};
- chat.client.addPublicStream = function (pubStrInfo)
- {
+ chat.client.addPublicStream = function (pubStrInfo) {
$(' ').append(pubStrInfo.sender + ': ')
- .append(''+pubStrInfo.title+' ').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);
+ .append('' + pubStrInfo.title + ' ').append('[' + pubStrInfo.mediaType + ']').addClass('streaminfo').appendTo(notifications);
};
- chat.client.push = function (what, data)
- {
+ chat.client.push = function (what, data) {
$(' ').append(what + ': ')
.append(data.event).addClass('event').appendTo(notifications);
};
@@ -125,7 +123,7 @@ window.ChatHubHandler = (function ($) {
if (chanInfo) {
var chanId = 'r' + chanInfo.Name;
$('#tv_' + chanId).replaceWith(chanInfo.Topic);
- }
+ }
};
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) {
if (chatInfo) {
setChanInfo(chatInfo);
- setActiveChan('r'+chatInfo.Name);
+ setActiveChan('r' + chatInfo.Name);
}
});
};
@@ -158,7 +155,6 @@ window.ChatHubHandler = (function ($) {
var roomlist = $('
');
roomlist.appendTo(chatbar);
var ptc = $(' ').addClass('ptcroix');
-
$('Join : ')
.appendTo(roomjoin);
var chanName = $(' ');
@@ -206,15 +202,16 @@ window.ChatHubHandler = (function ($) {
};
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);
+ }
};
var DestroyRoom = function () {
if (frontChanId) {
$('#v' + 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);
});
@@ -264,7 +261,7 @@ window.ChatHubHandler = (function ($) {
});
}, 30000); // Re-start connection after 30 seconds
});
-
+
chanName.keydown(function (event) {
if (event.which == 13) {
if (this.value.length == 0) return;
@@ -275,7 +272,7 @@ window.ChatHubHandler = (function ($) {
// else TODO showRoomInfo(this.value);
});
- ptc.click(function(){
+ ptc.click(function() {
DestroyRoom();
});
@@ -309,8 +306,7 @@ window.ChatHubHandler = (function ($) {
return encodedValue;
}
- // FIXME cx clean shutdown
- // $(window).unload(function () { });
+ $(window).unload(function () { $.connection.hub.abort() });
};
diff --git a/src/Yavsc/wwwroot/js/chat.min.js b/src/Yavsc/wwwroot/js/chat.min.js
index e69de29b..21edb97f 100644
--- a/src/Yavsc/wwwroot/js/chat.min.js
+++ b/src/Yavsc/wwwroot/js/chat.min.js
@@ -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=$('').addClass('userlist');var notifications=$('').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=$(''+htmlEncode(name)+' ').click(function(){buildPv(name);});var $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(''+htmlEncode(name)+' : '+htmlEncode(message)+' ');};chat.client.notifyRoom=function(tag,targetid,message){if(tag==='connected'||tag==='reconnected'){onUserConnected(targetid,message);return;}else if(tag==='disconnected'){onUserDisconnected(targetid,message);return;}
+$(' ').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;}
+$(' ').append(tag+': '+targetid+': ').append(message).addClass(tag).appendTo(notifications);};chat.client.notifyUserInRoom=function(tag,room,message){$(' ').append(tag+': ').append(message).addClass(tag).appendTo($('#room_'+room));};chat.client.addPublicStream=function(pubStrInfo){$(' ').append(pubStrInfo.sender+': ').append(''+pubStrInfo.title+' ').append('['+pubStrInfo.mediaType+']').addClass('streaminfo').appendTo(notifications);};chat.client.push=function(what,data){$(' ').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=$('
');var roomjoin=$('
');var roomlist=$('
');roomlist.appendTo(chatbar);var ptc=$(' ').addClass('ptcroix');$('Join : ').appendTo(roomjoin);var chanName=$(' ');chanName.appendTo(roomjoin);ptc.appendTo(roomjoin);roomjoin.appendTo(chatbar);chatbar.appendTo($view);var chatlist=$('
');chatlist.appendTo($view);var buildChan=function(chdp,chanType,chanName,sendCmd){var chanId=chanType+chanName;var roomTag=$(''+chdp+chanName+' ').addClass('btn');roomTag.prop('id','sel_'+chanId).click(function(){setActiveChan(chanId);$(this).removeClass('btn-primary');});roomTag.appendTo(roomlist);var roomview=$('
').addClass('container');roomview.appendTo(chatlist);roomview.prop('id','v'+chanId);$('
').prop('id','tv_'+chanId).appendTo(roomview);var msglist=$('').addClass('mesglist');msglist.prop('id',chanId);msglist.appendTo(roomview);$(' ').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();$(' '+uname+' ').prop('id','u_'+uname).css('cursor','pointer').click(function(){buildPv(uname);}).appendTo(ulist);};function htmlEncode(value){var encodedValue=$('
').text(value).html();return encodedValue;}
+$(window).unload(function(){$.connection.hub.abort()});};$(document).ready(function($){ChatView($('#chatview'),true);});})(window.jQuery);
\ No newline at end of file