mirror of
https://github.com/RobinLinus/snapdrop.git
synced 2025-05-29 05:50:16 -07:00
Merge remote-tracking branch 'origin/master' into localhost
This commit is contained in:
commit
e6f3555619
@ -51,7 +51,10 @@ ShareDrop uses WebRTC only and isn't compatible with Safari browsers. Snapdrop u
|
||||
|
||||
# open a second shell:
|
||||
cd snapdrop/client
|
||||
# Python 2
|
||||
python -m SimpleHTTPServer
|
||||
# Python 3
|
||||
python3 -m http.server
|
||||
```
|
||||
|
||||
Now point your browser to http://localhost:8000.
|
||||
|
@ -273,8 +273,12 @@ class RTCPeer extends Peer {
|
||||
|
||||
if (message.sdp) {
|
||||
this._conn.setRemoteDescription(new RTCSessionDescription(message.sdp))
|
||||
.then( _ => this._conn.createAnswer())
|
||||
.then(d => this._onDescription(d))
|
||||
.then( _ => {
|
||||
if (message.sdp.type === 'offer') {
|
||||
return this._conn.createAnswer()
|
||||
.then(d => this._onDescription(d));
|
||||
}
|
||||
})
|
||||
.catch(e => this._onError(e));
|
||||
} else if (message.ice) {
|
||||
this._conn.addIceCandidate(new RTCIceCandidate(message.ice));
|
||||
|
Loading…
x
Reference in New Issue
Block a user