Skip to content

Commit

Permalink
Correção do chat, inversão da posição
Browse files Browse the repository at this point in the history
  • Loading branch information
tgenuino committed Jan 28, 2014
1 parent 9bf827a commit ce8c533
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
@@ -0,0 +1,2 @@
node_modules/
public/node_modules/
8 changes: 6 additions & 2 deletions public/dev/assets/js/_scripts/game.js
@@ -1,11 +1,15 @@
(function() {
'use strict';
var socket = io.connect('/chess');
var msgContent = $('.messages-container');
msgContent[0].scrollTop = msgContent[0].scrollHeight;

// Functions
var addChatMsg = function(data) {
$('.messages-content')
.prepend('<div class="messages-box reply"><a class="user-photo"><img src="'+players[data.player].picture+'" /></a><p class="message">'+data.message.replace(/\n/g, '<br>')+'<span class="message-date">'+data.date+'</span></p></div>');
msgContent
.append('<div class="messages-box reply"><a class="user-photo"><img src="'+players[data.player].picture+'" /></a><p class="message">'+data.message.replace(/\n/g, '<br>')+'<span class="message-date">'+data.date+'</span></p></div>');

msgContent[0].scrollTop = msgContent[0].scrollHeight;
};

var addLog = function(type, playerid, date, msg) {
Expand Down
7 changes: 5 additions & 2 deletions public/dev/assets/js/game.min.js
@@ -1,7 +1,10 @@
!function() {
"use strict";
var socket = io.connect("/chess"), addChatMsg = function(data) {
$(".messages-content").prepend('<div class="messages-box reply"><a class="user-photo"><img src="' + players[data.player].picture + '" /></a><p class="message">' + data.message.replace(/\n/g, "<br>") + '<span class="message-date">' + data.date + "</span></p></div>");
var socket = io.connect("/chess"), msgContent = $(".messages-container");
msgContent[0].scrollTop = msgContent[0].scrollHeight;
var addChatMsg = function(data) {
msgContent.append('<div class="messages-box reply"><a class="user-photo"><img src="' + players[data.player].picture + '" /></a><p class="message">' + data.message.replace(/\n/g, "<br>") + '<span class="message-date">' + data.date + "</span></p></div>"),
msgContent[0].scrollTop = msgContent[0].scrollHeight;
}, addLog = function(type, playerid, date, msg) {
var player = players[playerid];
$(".log-container .log-list").prepend("<li><span>[ " + date + ' ]</span> <a href="#">' + player.name.split(" ")[0] + "</a> " + msg + "</li>");
Expand Down
2 changes: 1 addition & 1 deletion public/dev/assets/js/scripts.min.js
Expand Up @@ -3192,7 +3192,7 @@
c.apply(null, arguments);
} : bb);
}
for (var bb, cb, db = "2.4.0", eb = Math.round, fb = 0, gb = 1, hb = 2, ib = 3, jb = 4, kb = 5, lb = 6, mb = {}, nb = "undefined" != typeof module && module.exports, ob = /^\/?Date\((\-?\d+)/i, pb = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/, qb = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/, rb = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g, sb = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, tb = /\d\d?/, ub = /\d{1,3}/, vb = /\d{3}/, wb = /\d{1,4}/, xb = /[+\-]?\d{1,6}/, yb = /\d+/, zb = /[0-9]*['a-z -׿܀-퟿豈-﷏ﷰ-￯]+|[؀-ۿ\/]+(\s*?[؀-ۿ]+){1,2}/i, Ab = /Z|[\+\-]\d\d:?\d\d/i, Bb = /T/i, Cb = /[\+\-]?\d+(\.\d{1,3})?/, Db = /^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d:?\d\d|Z)?)?$/, Eb = "YYYY-MM-DDTHH:mm:ssZ", Fb = [ "YYYY-MM-DD", "GGGG-[W]WW", "GGGG-[W]WW-E", "YYYY-DDD" ], Gb = [ [ "HH:mm:ss.SSSS", /(T| )\d\d:\d\d:\d\d\.\d{1,3}/ ], [ "HH:mm:ss", /(T| )\d\d:\d\d:\d\d/ ], [ "HH:mm", /(T| )\d\d:\d\d/ ], [ "HH", /(T| )\d\d/ ] ], Hb = /([\+\-]|\d\d)/gi, Ib = "Date|Hours|Minutes|Seconds|Milliseconds".split("|"), Jb = {
for (var bb, cb, db = "2.4.0", eb = Math.round, fb = 0, gb = 1, hb = 2, ib = 3, jb = 4, kb = 5, lb = 6, mb = {}, nb = "undefined" != typeof module && module.exports, ob = /^\/?Date\((\-?\d+)/i, pb = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/, qb = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/, rb = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g, sb = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, tb = /\d\d?/, ub = /\d{1,3}/, vb = /\d{3}/, wb = /\d{1,4}/, xb = /[+\-]?\d{1,6}/, yb = /\d+/, zb = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i, Ab = /Z|[\+\-]\d\d:?\d\d/i, Bb = /T/i, Cb = /[\+\-]?\d+(\.\d{1,3})?/, Db = /^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d:?\d\d|Z)?)?$/, Eb = "YYYY-MM-DDTHH:mm:ssZ", Fb = [ "YYYY-MM-DD", "GGGG-[W]WW", "GGGG-[W]WW-E", "YYYY-DDD" ], Gb = [ [ "HH:mm:ss.SSSS", /(T| )\d\d:\d\d:\d\d\.\d{1,3}/ ], [ "HH:mm:ss", /(T| )\d\d:\d\d:\d\d/ ], [ "HH:mm", /(T| )\d\d:\d\d/ ], [ "HH", /(T| )\d\d/ ] ], Hb = /([\+\-]|\d\d)/gi, Ib = "Date|Hours|Minutes|Seconds|Milliseconds".split("|"), Jb = {
Milliseconds: 1,
Seconds: 1e3,
Minutes: 6e4,
Expand Down
2 changes: 1 addition & 1 deletion view/game.jade
Expand Up @@ -142,7 +142,7 @@ block body
h6 Messages
.messages-container
.messages-content
each chat in room.chat.reverse()
each chat in room.chat
+chatMsg(chat.player, {msg: chat.message, date:chat.date})

textarea(row="5").messages-send
Expand Down

0 comments on commit ce8c533

Please sign in to comment.