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');
-
$('')
.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('ptcroix');$('').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=$('