deps: Upgrade and move winchan.js from /static/third to npm

Fixes zulip#1709.
refeed · Jan 8, 2017 · 2034859 · 2034859
1 parent a261801
commit 2034859
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 277 deletions.
diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY
@@ -191,11 +191,6 @@ Copyright: 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters
 License: Expat
 Comment: https://github.com/jashkenas/underscore/blob/master/LICENSE
 
-Files: static/third/winchan/*
-Copyright: 2012 Lloyd Hilaiel
-License: Expat
-Comment: https://github.com/mozilla/winchan
-
 Files: static/third/xdate/*
 Copyright: 2010 C. F., Wong
 License: Expat

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "plotly.js": "1.19.2",
     "sockjs-client":"1.1.1",
     "webpack": "1.12.2",
+    "winchan": "0.2.0",
     "zxcvbn": "4.4.1"
   },
   "devDependencies": {

diff --git a/static/third/winchan/winchan.js b/static/third/winchan/winchan.js
diff --git a/zproject/settings.py b/zproject/settings.py
@@ -766,7 +766,7 @@ def get_secret(key):
             'third/lazyload/lazyload.js',
             'third/spectrum/spectrum.js',
             'third/string-prototype-codepointat/codepointat.js',
-            'third/winchan/winchan.js',
+            'node_modules/winchan/winchan.js',
             'third/handlebars/handlebars.runtime.js',
             'third/marked/lib/marked.js',
             'templates/compiled.js',