public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inject the pad dependency into chat.

pull/343/head
Chad Weider 2012-01-15 21:05:19 -08:00
parent 8a0d6c6636
commit 72d29b1c62
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/chat.js
View File

@ -82,13 +82,13 @@ var chat = (function()
send: function() send: function()
{ {
var text = $("#chatinput").val(); var text = $("#chatinput").val();
pad.collabClient.sendMessage({"type": "CHAT_MESSAGE", "text": text}); this._pad.collabClient.sendMessage({"type": "CHAT_MESSAGE", "text": text});
$("#chatinput").val(""); $("#chatinput").val("");
}, },
addMessage: function(msg, increment) addMessage: function(msg, increment)
{ {
//correct the time //correct the time
msg.time += pad.clientTimeOffset; msg.time += this._pad.clientTimeOffset;
//create the time string //create the time string
var minutes = "" + new Date(msg.time).getMinutes(); var minutes = "" + new Date(msg.time).getMinutes();
@ -150,8 +150,9 @@ var chat = (function()
self.scrollDown(); self.scrollDown();
}, },
init: function() init: function(pad)
{ {
this._pad = pad;
$("#chatinput").keypress(function(evt) $("#chatinput").keypress(function(evt)
{ {
//if the user typed enter, fire the send //if the user typed enter, fire the send

2
static/js/pad2.js
View File

@ -413,7 +413,7 @@ var pad = {
pad.clientTimeOffset = new Date().getTime() - clientVars.serverTimestamp; pad.clientTimeOffset = new Date().getTime() - clientVars.serverTimestamp;
//initialize the chat //initialize the chat
chat.init(); chat.init(this);
pad.initTime = +(new Date()); pad.initTime = +(new Date());
pad.padOptions = clientVars.initialOptions; pad.padOptions = clientVars.initialOptions;