Maxim Sokhatsky 11 years ago
parent
commit
1f972f1f20

+ 3 - 0
apps/web/priv/static/app/js/chat.js

@@ -67,6 +67,8 @@ function chatMessage(chatName, id, me, string) {
     var messageElement = svg(html);
     messageElement.appendChild(textElement);
     document.getElementById(chatName).appendChild(messageElement);
+    console.log("chatMessage:70 textElement=");
+    console.log(textElement);
     create_multiline(textElement);
     var y2 = textElement.getBBox().height + 5;
     var box = "<path xmlns:data='"+container+"' xmlns='http://www.w3.org/2000/svg' d='M"+x1+","+y1+
@@ -98,6 +100,7 @@ function chatText(container, id, me, string) {
         " xmlns='http://www.w3.org/2000/svg' "+
         " font-family='Exo 2' font-size='16' font-weight='normal' fill='"+colors[i]+"'>" +
             string + "</text>";
+    console.log(html);
     return svg(html);
 }
 

+ 1 - 0
apps/web/priv/static/app/js/roster.js

@@ -44,6 +44,7 @@ function RosterHandlers(scope) {
             names = dec(e.raw).value[0][1].value[0][1].value,
             to = dec(e.raw).value[0][2].value,
             message = dec(e.raw).value[0][3];
+        console.log("Income");
         console.log(message);
         chatMessage(currentChat,"1",from==document.user?"Self":from,/*names+":\n"+*/message);
         onlineHover();

+ 1 - 1
apps/web/src/okey.erl

@@ -254,7 +254,7 @@ event(pause) ->
 
 event({client,{message,From,Name,To,Message}}) ->
     wf:info(?MODULE,"Chat Message from ~p(~p) to ~p:~n ~p~n",[From,Name,To,Message]),
-    wf:send(To,{server,{chat_message,{From,Name},To,unicode:characters_to_binary(Message)}}),
+    wf:send(To,{server,{chat_message,{From,Name},To,Message}}),
     ok;
 
 event({client,Message}) ->