Merge pull request #20 from xge/issue/5

Fixes #5

.gitignore

@@ -1,3 +1,6 @@
+# IntelliJ IDEA
+.idea
+
 # Logs
 logs
 *.log

app/common/helper/Message.coffee

@@ -1,2 +1,6 @@
 class Message
-  constructor: (@timestamp = new Date().getTime(), @user, @payload, @type = 'msg') ->
+  constructor: (timestamp = new Date().getTime(), user, payload, type = 'msg') ->
+    @timestamp = timestamp
+    @user = user
+    @payload = payload
+    @type = type

app/index/index.coffee

@@ -1,6 +1,9 @@
 app.controller 'IndexController',
   class IndexController
-    constructor: (@$filter, @Socket, @HtmlHelper) ->
+    constructor: ($filter, Socket, HtmlHelper) ->
+      @$filter = $filter
+      @Socket = Socket
+      @HtmlHelper = HtmlHelper
       @has_error = false
       @username = ''
       @clist = []

app/less/app.less

@@ -62,6 +62,9 @@
 @import "../../bower_components/bootstrap/less/utilities.less";
 @import "../../bower_components/bootstrap/less/responsive-utilities.less";
 
+// Emoticons
+@import (inline) "../../bower_components/ng-emoticons/dist/ng-emoticons.min.css";
+
 // Theme
 @import "bootswatch.less";
 
@@ -128,18 +131,4 @@ body {
   position: fixed;
   right: 30px;
   top: 55px;
-}
-
-.icon-smiley {
-    font-family: 'icomoon';
-    speak: none;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 1;
-
-    /* Better Font Rendering =========== */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
+}

bower.json

@@ -15,15 +15,12 @@
     "tests"
   ],
   "dependencies": {
-    "bootstrap": "~3.3.1",
-    "angular": "~1.3.9",
-    "angular-route": "~1.3.9",
-    "angular-socket-io": "~0.7.0",
-    "jquery": "~2.1.3",
-    "ng-emoticons": "*",
-    "angular-sanitize": "~1.3.9"
-  },
-  "resolutions": {
-    "angular": "~1.3.9"
+    "bootstrap": "~3.3.*",
+    "angular": "~1.3.10",
+    "angular-route": "~1.3.*",
+    "angular-socket-io": "~0.7.*",
+    "jquery": "~2.1.*",
+    "ng-emoticons": "https://github.com/xge/ngEmoticons.git",
+    "angular-sanitize": "~1.3.*"
   }
 }

package.json

@@ -18,13 +18,13 @@
   },
   "homepage": "https://github.com/xge/chat.js",
   "dependencies": {
-    "body-parser": "^1.10.1",
+    "body-parser": "^1.11.0",
     "bower": "^1.3.12",
-    "coffee-script": "^1.8.0",
+    "coffee-script": "^1.9.0",
     "coffee-trace": "^1.4.0",
-    "compression": "^1.3.0",
+    "compression": "^1.4.0",
     "debug": "^2.1.1",
-    "express": "^4.11.0",
+    "express": "^4.11.2",
     "grunt": "^0.4.5",
     "grunt-coffeelint": "0.0.13",
     "grunt-contrib-coffee": "^0.12.0",
@@ -33,14 +33,14 @@
     "grunt-contrib-less": "^1.0.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-html2js": "^0.3.0",
-    "load-grunt-tasks": "^2.0.0",
+    "load-grunt-tasks": "^3.1.0",
     "moment": "^2.9.0",
-    "socket.io": "^1.2.1"
+    "socket.io": "^1.3.2"
   },
   "devDependencies": {
     "chai": "^1.10.0",
     "grunt-mocha": "^0.4.11",
     "mocha": "^2.1.0",
-    "should": "^4.6.0"
+    "should": "^4.6.3"
   }
 }