Merge pull request #962 from nlegoff/websocket-js

[3.9] Add web-socket-js as project dependency

Gruntfile.js

@@ -291,6 +291,16 @@ module.exports = function(grunt) {
                 "dest": "<%= path.asset %>/underscore-amd/",
                 "flatten": true
             },
+            "web-socket-js": {
+                "expand": true,
+                "src": [
+                    "<%= path.bower %>/web-socket-js/LICENSE.txt",
+                    "<%= path.bower %>/web-socket-js/WebSocketMain.swf",
+                    "<%= path.bower %>/web-socket-js/web_socket.js"
+                ],
+                "dest": "<%= path.asset %>/web-socket-js",
+                "flatten": true
+            },
             "zxcvbn": {
                 "expand": true,
                 "src": [
@@ -390,6 +400,7 @@ module.exports = function(grunt) {
         "copy:swfobject",
         "copy:tinymce",
         "copy:underscore",
+        "copy:web-socket-js",
         "copy:zxcvbn"
     ]);
     grunt.registerTask("install-assets", [

bower.json

@@ -25,7 +25,8 @@
         "jquery-galleria": "1.2.9",
         "jquery.cookie": "~1.4",
         "autobahnjs": "~0.8.0",
-        "when": "~2.7.0"
+        "when": "~2.7.0",
+        "web-socket-js": "~1.0.1"
     },
     "devDependencies": {
         "mocha": "latest",