Skip to content

Commit

Permalink
Fix mozilla/thimble.mozilla.org#2350 - Shifted turn server locally. (#…
Browse files Browse the repository at this point in the history
…824)

* Shifted turn server locally

* Shifted concurrently and signal-master to devDependencies

* Structured npm run start command
  • Loading branch information
hkirat authored and gideonthomas committed Jul 6, 2017
1 parent ee19a5e commit bf33b3a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@
"pica": "^3.0.4",
"q": "1.4.1",
"semver": "^4.1.0",
"wolfy87-eventemitter": "^5.1.0",
"simplewebrtc": "^3.0.0",
"wolfy87-eventemitter": "^5.1.0",
"xmldoc": "^0.1.2"
},
"devDependencies": {
"bluebird": "^3.4.7",
"concurrently": "^3.5.0",
"grunt-newer": "^1.3.0",
"gunzip-maybe": "^1.3.1",
"http-server": "mozilla/http-server#gzip",
Expand All @@ -61,6 +62,7 @@
"request": "^2.69.0",
"requirejs": "^2.3.3",
"rimraf": "^2.6.1",
"signal-master": "^1.0.1",
"sw-precache": "^5.0.0",
"tar-fs": "^1.15.1"
},
Expand All @@ -73,7 +75,9 @@
"preproduction": "grunt build-browser-compressed && npm run unlocalize",
"production": "npm start -- --gzip",
"test": "grunt test && grunt build-browser-compressed",
"server": "http-server -p 8000 --cors",
"server:webrtc": "node node_modules/signal-master",
"server:static": "http-server -p 8000 --cors",
"server": "concurrently \"npm run server:webrtc\" \"npm run server:static\"",
"prestart": "npm run localize && grunt build-browser-dev",
"start": "npm run server || true",
"poststart": "npm run unlocalize"
Expand Down
4 changes: 3 additions & 1 deletion src/editor/Collaboration.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ define(function (require, exports, module) {
// the id/element dom element that will hold remote videos
remoteVideosEl: 'remotesVideos',
// immediately ask for camera access
autoRequestMedia: false
autoRequestMedia: false,
// TODO : Shift this to config.
url: "localhost:8888"
});
this.webrtc = webrtc;
this.pending = []; // pending clients that need to be initialized.
Expand Down

0 comments on commit bf33b3a

Please sign in to comment.