Skip to content

Commit 1e4d1bc

Browse files
author
Batiste Bieler
committed
Add a chat log
1 parent c72ef73 commit 1e4d1bc

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

chat/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from django.http import HttpResponse
66
from gevent.event import Event
77
from django.conf import settings
8+
from django.utils.html import escape
89

910
from chat.models import Map
1011

@@ -91,7 +92,7 @@ def player_update_position(self, request):
9192

9293
def message_new(self, request):
9394
key = request.COOKIES['rpg_key']
94-
msg = request.POST['body']
95+
msg = escape(request.POST['body'])
9596
player = self.get_player(key)
9697
player['last_message'] = msg
9798
self.new_room_event(['last_message', [key, msg]])

static/game.css

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
#main {
3-
width:760px;
3+
width:770px;
44
margin:0 auto;
55
}
66

@@ -31,10 +31,30 @@ body {
3131
background:#666;
3232
}
3333

34-
#tileset-container {
34+
#right-container {
35+
width:188px;
3536
float:right;
3637
color:#fff;
3738
}
39+
40+
#chat-log {
41+
border:1px #666 solid;
42+
padding:10px;
43+
list-style:none;
44+
height:270px;
45+
overflow:auto;
46+
}
47+
48+
#chat-log li {
49+
padding:0;
50+
margin:0;
51+
color:#eee;
52+
}
53+
54+
#chat-log li span{
55+
color:#aaa;
56+
}
57+
3858
#grid-serialized {
3959
width:600px;
4060
height:100px;

static/game.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,11 @@ $(function() {
259259
Player.prototype.say = function(message) {
260260
clearTimeout(this.message_timeout);
261261
var el = this.message_element;
262-
this.message_element.text(message);
262+
var chat_log_item = $('<li></li>');
263+
chat_log_item.html('<span>' + this.pname + ':</span> ' + message);
264+
$('#chat-log').append(chat_log_item)
265+
$('#chat-log').scrollTop(1000)
266+
this.message_element.html(message);
263267
this.message_element.slideDown("slow");
264268
var _hide_message = function(){el.slideUp("slow");}
265269
this.message_timeout = setTimeout(_hide_message, 12000);

templates/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
<div id="main">
1010
<p id="room_data"><span id="room_name">{{ map.name }}</span>
1111
(<span id="room_x">{{ map.x }}</span>, <span id="room_y">{{ map.y }}</span></span>)</p>
12-
<div id="tileset-container">
12+
<div id="right-container">
1313
<img src="{{MEDIA_URL}}tileset.png" id="tileset">
1414
<br>
1515
<input id="save-map" type="submit" value="Save map">
1616
<span id="save-message" style="display:none">Map saved.</span>
17+
18+
<ul id="chat-log"></ul>
1719
</div>
1820

1921
<div id="map"></div>
@@ -24,7 +26,6 @@
2426
</form>
2527
<input type="button" value="Magic" id="magic">
2628
</div>
27-
2829
<div id="select"></div>
2930
</div>
3031
<script>

0 commit comments

Comments
 (0)