Permalink
Browse files

Beginnings of 0.3 refactor (sqlite db, asset libs updated, multi-conn…

…ection support). This is all really broken right now. Making good progress though.
  • Loading branch information...
1 parent e65aabf commit 1d3732686fdee6b59577fdd2c1b1e1e7859ae58b @ericbarch ericbarch committed May 4, 2013
View
@@ -3,3 +3,4 @@ builtAssets/
run.sh
*.swp
.sass-cache
+.DS_Store
View
@@ -11,7 +11,6 @@ Try it out [here](http://198.58.100.168:3000/). Thanks linode for the instance!
Subway is built with [node.js](http://nodejs.org/),
[node-irc](https://github.com/martynsmith/node-irc)
-and [MongoDB](http://www.mongodb.org/) on the backend,
and [Backbone.js](http://documentcloud.github.com/backbone/) and
[jQuery](http://jquery.com/) on the frontend.

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,6 +1,5 @@
-//= require 'libs/socket.io.js'
-//= require 'libs/jquery-1.7.1.min.js'
-//= require 'libs/jquery.scrollTo-1.4.2-min.js'
+//= require 'libs/jquery-2.0.0.min.js'
+//= require 'libs/jquery.scrollTo-1.4.3.1-min.js'
//= require 'libs/underscore-min.js'
//= require 'libs/backbone-min.js'
//= require 'libs/ICanHaz.min.js'
@@ -183,6 +182,13 @@ $(function() {
}
});
+ irc.socket.on('action', function(data) {
+ var chatWindow = irc.chatWindows.getByName(data.to.toLowerCase());
+ var type = 'message';
+
+ chatWindow.stream.add({sender: data.from, raw: ' ACTION ' + data.text, type: type});
+ });
+
irc.socket.on('pm', function(data) {
var chatWindow = irc.chatWindows.getByName(data.nick.toLowerCase());
if (typeof chatWindow === 'undefined') {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 1d37326

Please sign in to comment.