pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Removed debug and cleaned up.

pull/100/head
Simon Eisenmann 11 years ago
parent
2260bc7136
commit
05b2437378
6 changed files with 28 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      static/js/controllers/mediastreamcontroller.js
  2. 5
      static/js/controllers/roomchangecontroller.js
  3. 10
      static/js/mediastream/api.js
  4. 10
      static/js/services/contacts.js
  5. 2
      static/js/services/usersettingsdata.js
  6. 4
      static/js/services/videolayout.js

33
static/js/controllers/mediastreamcontroller.js
Unescape View File

@ -267,34 +267,23 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
if ($window.webrtcDetectedBrowser === "chrome") { if ($window.webrtcDetectedBrowser === "chrome") {
// NOTE(longsleep): We can always enable SCTP data channels, as we have a workaround // NOTE(longsleep): We can always enable SCTP data channels, as we have a workaround
// using the "active" event for Firefox < 27. // using the "active" event for Firefox < 27.
if (true) { // SCTP does not work correctly with Chrome 31. Require M32.
// SCTP does not work correctly with Chrome 31. Require M32. if ($window.webrtcDetectedVersion >= 32) {
if ($window.webrtcDetectedVersion >= 32) { // SCTP is supported from Chrome M31.
// SCTP is supported from Chrome M31. // No need to pass DTLS constraint as it is on by default in Chrome M31.
// No need to pass DTLS constraint as it is on by default in Chrome M31. // For SCTP, reliable and ordered is true by default.
// For SCTP, reliable and ordered is true by default.
console.info("Using SCTP based Data Channels.");
} else {
// Chrome < M31 does not yet do DTLS-SRTP by default whereas Firefox only
// does DTLS-SRTP. In order to get interop, you must supply Chrome
// with a PC constructor constraint to enable DTLS.
optionalPcConstraints.push({
DtlsSrtpKeyAgreement: true
});
}
} else { } else {
// NOTE(longsleep): This disables SCTP data channels, which hacks Firefox // Chrome < M32 does not yet do DTLS-SRTP by default whereas Firefox only
// support by forcing old style Chrome Rtp data channels. SCTP Data Channels // does DTLS-SRTP. In order to get interop, you must supply Chrome
// between Firefox and Chrome will not work until FF 27. // with a PC constructor constraint to enable DTLS.
// See https://code.google.com/p/webrtc/issues/detail?id=2279 and console.warn("Turning on SCTP combatibility - please update your Chrome.");
// https://code.google.com/p/chromium/issues/detail?id=295771
optionalPcConstraints.push({ optionalPcConstraints.push({
RtpDataChannels: true DtlsSrtpKeyAgreement: true
}); });
} }
} }
console.log("WebRTC settings", mediaStream.webrtc.settings); //console.log("WebRTC settings", mediaStream.webrtc.settings);
}; };

5
static/js/controllers/roomchangecontroller.js
Unescape View File

@ -71,7 +71,10 @@ define([], function() {
$scope.roomdata = {}; $scope.roomdata = {};
$scope.$watch("roomdata.name", function(n) { $scope.$watch("roomdata.name", function(n) {
console.log("roomdata.name changed", n); //console.log("roomdata.name changed", n);
if (!n) {
n = "";
}
var u = encodeURIComponent(n); var u = encodeURIComponent(n);
$scope.roomdata.url = "/" + u; $scope.roomdata.url = "/" + u;
$scope.roomdata.link = mediaStream.url.room(n); $scope.roomdata.link = mediaStream.url.room(n);

10
static/js/mediastream/api.js
Unescape View File

@ -139,7 +139,7 @@ define(['jquery', 'underscore'], function($, _) {
switch (dataType) { switch (dataType) {
case "Self": case "Self":
console.log("Self received", data); //console.log("Self received", data);
if (data.Token) { if (data.Token) {
this.connector.token = data.Token; this.connector.token = data.Token;
} }
@ -148,7 +148,7 @@ define(['jquery', 'underscore'], function($, _) {
this.e.triggerHandler("received.self", [data]); this.e.triggerHandler("received.self", [data]);
break; break;
case "Offer": case "Offer":
console.log("Offer received", data.To, data.Offer); //console.log("Offer received", data.To, data.Offer);
this.e.triggerHandler("received.offer", [data.To, data.Offer, data.Type, d.To, d.From]); this.e.triggerHandler("received.offer", [data.To, data.Offer, data.Type, d.To, d.From]);
break; break;
case "Candidate": case "Candidate":
@ -156,11 +156,11 @@ define(['jquery', 'underscore'], function($, _) {
this.e.triggerHandler("received.candidate", [data.To, data.Candidate, data.Type, d.To, d.From]); this.e.triggerHandler("received.candidate", [data.To, data.Candidate, data.Type, d.To, d.From]);
break; break;
case "Answer": case "Answer":
console.log("Answer received", data.To, data.Answer); //console.log("Answer received", data.To, data.Answer);
this.e.triggerHandler("received.answer", [data.To, data.Answer, data.Type, d.To, d.From]); this.e.triggerHandler("received.answer", [data.To, data.Answer, data.Type, d.To, d.From]);
break; break;
case "Users": case "Users":
console.log("Connected users: " + data.Users.length); //console.log("Connected users: " + data.Users.length);
this.e.triggerHandler("received.users", [data.Users]); this.e.triggerHandler("received.users", [data.Users]);
break; break;
case "Bye": case "Bye":
@ -169,7 +169,7 @@ define(['jquery', 'underscore'], function($, _) {
break; break;
case "Joined": case "Joined":
case "Left": case "Left":
console.log("User action received", dataType, data); //console.log("User action received", dataType, data);
this.e.triggerHandler("received.userleftorjoined", [dataType, data]); this.e.triggerHandler("received.userleftorjoined", [dataType, data]);
break; break;
case "Status": case "Status":

10
static/js/services/contacts.js
Unescape View File

@ -33,7 +33,7 @@ define(['underscore', 'jquery', 'modernizr', 'sjcl', 'text!partials/contactsmana
var transaction = event.target.transaction; var transaction = event.target.transaction;
transaction.onerror = _.bind(that.onerror, that); transaction.onerror = _.bind(that.onerror, that);
that.init(db); that.init(db);
console.log("Created contacts database.") console.info("Created contacts database.")
}; };
request.onsuccess = _.bind(that.onsuccess, that); request.onsuccess = _.bind(that.onsuccess, that);
}; };
@ -57,7 +57,7 @@ define(['underscore', 'jquery', 'modernizr', 'sjcl', 'text!partials/contactsmana
Database.prototype.onsuccess = function(event) { Database.prototype.onsuccess = function(event) {
this.db = event.target.result; this.db = event.target.result;
this.ready = true; this.ready = true;
console.log("Openend database", this.db); //console.log("Openend database", this.db);
this.e.triggerHandler("ready"); this.e.triggerHandler("ready");
}; };
Database.prototype.put = function(storename, data, successCallback, errorCallback) { Database.prototype.put = function(storename, data, successCallback, errorCallback) {
@ -172,7 +172,7 @@ define(['underscore', 'jquery', 'modernizr', 'sjcl', 'text!partials/contactsmana
this.key = sjcl.codec.base64.fromBits(sjcl.hash.sha256.hash(suserid+mediaStream.config.Token)); this.key = sjcl.codec.base64.fromBits(sjcl.hash.sha256.hash(suserid+mediaStream.config.Token));
// Create database name for user which. // Create database name for user which.
var id = "mediastream-" + this.id(userid); var id = "mediastream-" + this.id(userid);
console.log("Open of database:", id); //console.log("Open of database:", id);
var database = this.database = new Database(id); var database = this.database = new Database(id);
return database; return database;
} else { } else {
@ -210,7 +210,7 @@ define(['underscore', 'jquery', 'modernizr', 'sjcl', 'text!partials/contactsmana
Contacts.prototype.load = function() { Contacts.prototype.load = function() {
if (this.database) { if (this.database) {
console.log("Load contacts from storage", this); //console.log("Load contacts from storage", this);
var remove = []; var remove = [];
this.database.all("contacts", _.bind(function(data) { this.database.all("contacts", _.bind(function(data) {
var d = this.decrypt(data.contact); var d = this.decrypt(data.contact);
@ -251,7 +251,7 @@ define(['underscore', 'jquery', 'modernizr', 'sjcl', 'text!partials/contactsmana
Contacts.prototype.remove = function(userid) { Contacts.prototype.remove = function(userid) {
var contact = contactData.get(userid); var contact = contactData.get(userid);
console.log("contacts remove", userid, contact); //console.log("contacts remove", userid, contact);
if (contact) { if (contact) {
contactData.remove(userid); contactData.remove(userid);
if (this.database) { if (this.database) {

2
static/js/services/usersettingsdata.js
Unescape View File

@ -57,7 +57,7 @@ define(["sjcl"], function(sjcl) {
if (this.key) { if (this.key) {
raw = sjcl.decrypt(this.key, raw); raw = sjcl.decrypt(this.key, raw);
} }
console.log("Found stored user data:", raw); //console.log("Found stored user data:", raw);
return JSON.parse(raw); return JSON.parse(raw);
} catch(e) { } catch(e) {
console.warn("Failed to load stored user data:", e); console.warn("Failed to load stored user data:", e);

4
static/js/services/videolayout.js
Unescape View File

@ -286,7 +286,7 @@ define(["jquery", "underscore", "modernizr"], function($, _, Modernizr) {
if (!current) { if (!current) {
current = new renderers[name](container, scope, controller) current = new renderers[name](container, scope, controller)
console.log("Created new video layout renderer", name, current); //console.log("Created new video layout renderer", name, current);
$(layoutparent).addClass("renderer-" + name); $(layoutparent).addClass("renderer-" + name);
return true; return true;
} else { } else {
@ -296,7 +296,7 @@ define(["jquery", "underscore", "modernizr"], function($, _, Modernizr) {
$(layoutparent).removeClass("renderer-" + current.name); $(layoutparent).removeClass("renderer-" + current.name);
current = new renderers[name](container, scope, controller) current = new renderers[name](container, scope, controller)
$(layoutparent).addClass("renderer-" + name); $(layoutparent).addClass("renderer-" + name);
console.log("Switched to new video layout renderer", name, current); //console.log("Switched to new video layout renderer", name, current);
return true; return true;
} }
} }

Write Preview
Loading…
Cancel
Save