Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added roomName in createdPeer event #405

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

added roomName in createdPeer event #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5ac5de5
added roomName in createdPeer event (+1 squashed commit)
Mar 7, 2016
22834d5
added roomName on joinRoom and peer start event.
Mar 21, 2016
95161d6
2.1.3
Mar 21, 2016
7b61c4f
v2.1.3
Mar 21, 2016
edb9d57
v2.1.4
Mar 21, 2016
0698e95
fix roomName add
Mar 21, 2016
237b41f
v2.1.5
Mar 21, 2016
037362d
fix peer start and localScreenStopped event
Mar 24, 2016
447a3df
v2.1.6
Mar 24, 2016
f45e4c9
change encoding
Mar 24, 2016
6f2b4e6
change encoding
Mar 25, 2016
a749ce6
v2.1.7
Mar 25, 2016
008d028
Remove individual windows from screensharing (mozilla)
daniloarcidiacono Apr 19, 2016
9e71d67
2.1.4
daniloarcidiacono Apr 19, 2016
9fdbdbe
2.1.3
daniloarcidiacono Apr 19, 2016
247f934
v2.1.8
daniloarcidiacono Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
.DS_Store
npm-debug.log
.idea
23 changes: 23 additions & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "simplewebrtc",
"description": "World's easiest webrtc",
"main": "./simplewebrtc.bundle.js",
"authors": [
"csturiale <[email protected]>"
],
"license": "MIT",
"homepage": "https://github.com/objectway/SimpleWebRTC",
"moduleType": [
"node"
],
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"src/bower_components",
"test",
"tests"
],
"version": "2.1.8"
}
13 changes: 7 additions & 6 deletions latest-v2.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simplewebrtc",
"version": "2.1.0",
"version": "2.1.3",
"repository": {
"type": "git",
"url": "[email protected]:henrikjoreteg/SimpleWebRTC.git"
Expand All @@ -15,7 +15,8 @@
"wildemitter": "1.x",
"socket.io-client": "^1.3.7",
"attachmediastream": "^1.3.5",
"mockconsole": "0.0.1"
"mockconsole": "0.0.1",
"getscreenmedia": "https://github.com/Objectway/getScreenMedia.git"
},
"devDependencies": {
"browserify": "2.22.0",
Expand Down
4 changes: 2 additions & 2 deletions peer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@ Peer.prototype.onIceCandidate = function (candidate) {
}
};

Peer.prototype.start = function () {
Peer.prototype.start = function (roomName) {
var self = this;

// well, the webrtc api requires that we either
// a) create a datachannel a priori
// b) do a renegotiation later to add the SCTP m-line
// Let's do (a) first...
if (this.enableDataChannels) {
this.getDataChannel('simplewebrtc');
this.getDataChannel(roomName);
}

this.pc.offer(this.receiveMedia, function (err, sessionDescription) {
Expand Down
Loading