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.

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

883933669 #28

Open
wants to merge 46 commits into
base: websocket
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
239f033
update for 0.0.1 release
benbrittain Aug 10, 2012
31e6a74
update for 0.0.1 release
benbrittain Aug 10, 2012
36036ac
Merge pull request #2 from webRTC/websocket
benbrittain Aug 10, 2012
c1e2d60
removed nodejitsu thinks
Aug 10, 2012
308684d
Merge branch 'master' of https://github.com/webRTC/webrtc.io-demo
Aug 11, 2012
effe583
fix websocket problems with lisen to server
Aug 11, 2012
a404d7a
bump version num and clean up NPM
benbrittain Aug 11, 2012
04fd812
chance of api fic
Aug 11, 2012
d1ea339
fix for ln -s
Aug 14, 2012
64b00fe
fix symlink
Aug 14, 2012
30c1ede
add .swp to gitignore
Aug 18, 2012
e6bfa10
added suport of Chrome Version 25.0.1323.0 canary
coderaiser Nov 12, 2012
b7446ff
Merge pull request #6 from coderaiser/patch-1
benbrittain Nov 19, 2012
3daa35d
Update example/index.html
feiyunruyue Jan 11, 2013
243c217
Merge pull request #9 from feiyunruyue/master
Jan 17, 2013
7a2bd70
nits whitespace
jbenet Jan 27, 2013
eb46e8d
use webrtc.io-client directly (symlink was broken)
jbenet Jan 27, 2013
5e65ada
DataChannel support (with fallback)
jbenet Jan 27, 2013
af0231f
stylefix - removed commas ending hash
jbenet Jan 28, 2013
aa38365
Merge pull request #11 from jbenet/master
sarenji Jan 29, 2013
b1aaef0
Connect WebSocket relative to window.location
Feb 6, 2013
66bc37e
Updated dependencies from express 2.5.1 to express 3.1.0
Feb 6, 2013
2c4fd93
Small mistake: removed duplicate of 'server ='
Feb 6, 2013
dd775f0
Merge pull request #12 from danielkutik/master
sarenji Feb 6, 2013
15a7472
variable should be declared
Feb 7, 2013
ca6e5ba
update demo link
benbrittain Feb 9, 2013
839208e
put in actuall link
benbrittain Feb 9, 2013
5864d2b
Merge pull request #13 from danielkutik/master
sarenji Feb 11, 2013
654f9e2
fixed a url fragment issue with web socket url on page load for room …
mattnull Feb 18, 2013
8ef0dce
Merge pull request #14 from mattnull/master
sarenji Feb 18, 2013
7c6f3dd
new demo added and link to the demo page is now correct
Feb 21, 2013
5b7c8a9
remove old version
Feb 21, 2013
f195d17
fix in the readme setup instructions
Feb 21, 2013
1967058
remove google analytics
Feb 22, 2013
80bc181
declared
danielkutik Mar 3, 2013
fef6185
Removed unused variable
danielkutik Mar 3, 2013
8502bf8
Server listen port can now be defined in environment variables (usefu…
danielkutik Mar 3, 2013
4d3492f
Merge pull request #18 from danielkutik/master
sarenji Mar 4, 2013
cf3214c
default port now 8080
Mar 4, 2013
2e596b2
fix the link text to
Mar 4, 2013
001fe6b
Updated webrtc.io.js
danielkutik Mar 6, 2013
8bd941d
Merge pull request #19 from danielkutik/master
dennismartensson Mar 6, 2013
e9b8313
now firefox to firefox works. It looks like there is a conection betw…
Mar 17, 2013
6b0023f
fix the problems in the last build
Mar 17, 2013
e40f50e
sorry did miss some of them
Mar 17, 2013
79b1a15
add toogle to message and made the video of you smaller
dennismartensson Mar 22, 2013
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ lib-cov
*.out
*.pid
*.gz
*.swp

pids
logs
Expand Down
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#webrtc.io-demo
==============

webrtc.io modified to supply the client files

You can have a look at the demo on http://multiwebrtc.nodejitsu.com
You can have a look at the [demo](http://webrtc.dennis.is/)

##Instructions on how to setup the demo:

Expand All @@ -22,7 +20,7 @@ npm install
```

```bash
cd example
cd site
```

```bash
Expand All @@ -31,18 +29,18 @@ node server.js

In a version of Chrome that have webRTC support.

go to [localhost:8000/#1](http://localhost:8000/#1)
go to [localhost:8080](http://localhost:8080)

click allow to see your camera

go to [localhost:8000/#1](http://localhost:8000/#1)
go to [localhost:8080](http://localhost:8080)

click allow to see your camera and the connection will be made between your to open windows.


##For instructions on how to start with webRTC.io
##For instructions on how to start developing with webRTC.io

go to [https://github.com/cavedweller/webRTC.io](https://github.com/cavedweller/webRTC.io) and read the instructions.
go to [https://github.com/webRTC/webRTC.io](https://github.com/webRTC/webRTC.io) and read the instructions.

Developed by:
[@dennismatensson](https://github.com/dennismartensson)
Expand Down
195 changes: 0 additions & 195 deletions example/index.html

This file was deleted.

52 changes: 0 additions & 52 deletions example/style.css

This file was deleted.

1 change: 0 additions & 1 deletion example/webrtc.io.js

This file was deleted.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "MultiWebRTC",
"description": "Example of multi user webrtc",
"version": "0.0.1-31",
"version": "0.0.2-1",
"engines": {
"node": ">= 0.6.0"
},
"dependencies": {
"webrtc.io": "latest",
"express": "2.5.1",
"webrtc.io-client": "latest",
"express": "3.1.0",
"ws": "latest"
},
"subdomain": "MultiWebRTC",
Expand All @@ -29,4 +30,4 @@
"email": "[email protected]"
}
]
}
}
Binary file added site/fullscrean.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions site/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<html>
<head>
<title>Example webrtc.io</title>
<link type="text/css" href="/style.css" rel="stylesheet"></link>

<script src="/webrtc.io.js"></script>
</head>
<body onload="init()">
<div id="videos">
<a href="https://github.com/webRTC"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub"></a>
<video id="you" class="flip" autoplay width="263" height="200" style="position: absolute; left: 0px; bottom: 0px;"></video>
</div>
<div id="chatbox">
<div id="hideShowMessages" class="button">toggle chat</div>
<div id="messages">
</div>
<input id="chatinput" type="text" placeholder="Message:"/>
</div>

<div class="buttonBox">
<div id="fullscreen" class="button">Enter Full Screen</div>
<div id="newRoom" class="button">Create A New Room</div>
</div>

<script src="/script.js"></script>
</body>
</html>
Loading