From ce8c533d990e300b7bb5c09fbc6ddf48df0b1166 Mon Sep 17 00:00:00 2001 From: Thiago Genuino Date: Tue, 28 Jan 2014 20:12:49 -0200 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20do=20chat,=20invers=C3=A3o?= =?UTF-8?q?=20da=20posi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ public/dev/assets/js/_scripts/game.js | 8 ++++++-- public/dev/assets/js/game.min.js | 7 +++++-- public/dev/assets/js/scripts.min.js | 2 +- view/game.jade | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41fc59e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +public/node_modules/ \ No newline at end of file diff --git a/public/dev/assets/js/_scripts/game.js b/public/dev/assets/js/_scripts/game.js index 497ee8e..404bc25 100644 --- a/public/dev/assets/js/_scripts/game.js +++ b/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('

'+data.message.replace(/\n/g, '
')+''+data.date+'

'); + msgContent + .append('

'+data.message.replace(/\n/g, '
')+''+data.date+'

'); + + msgContent[0].scrollTop = msgContent[0].scrollHeight; }; var addLog = function(type, playerid, date, msg) { diff --git a/public/dev/assets/js/game.min.js b/public/dev/assets/js/game.min.js index 6c233af..cfb3023 100644 --- a/public/dev/assets/js/game.min.js +++ b/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('

' + data.message.replace(/\n/g, "
") + '' + data.date + "

"); + var socket = io.connect("/chess"), msgContent = $(".messages-container"); + msgContent[0].scrollTop = msgContent[0].scrollHeight; + var addChatMsg = function(data) { + msgContent.append('

' + data.message.replace(/\n/g, "
") + '' + data.date + "

"), + msgContent[0].scrollTop = msgContent[0].scrollHeight; }, addLog = function(type, playerid, date, msg) { var player = players[playerid]; $(".log-container .log-list").prepend("
  • [ " + date + ' ] ' + player.name.split(" ")[0] + " " + msg + "
    • "); diff --git a/public/dev/assets/js/scripts.min.js b/public/dev/assets/js/scripts.min.js index 840228d..0895024 100644 --- a/public/dev/assets/js/scripts.min.js +++ b/public/dev/assets/js/scripts.min.js @@ -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, diff --git a/view/game.jade b/view/game.jade index a942cd2..ab66456 100644 --- a/view/game.jade +++ b/view/game.jade @@ -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