|
|
|
@ -338,7 +338,6 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte |
|
|
|
} |
|
|
|
} |
|
|
|
$scope.reset(); |
|
|
|
$scope.reset(); |
|
|
|
}; |
|
|
|
}; |
|
|
|
$scope.loadUserSettings(true); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$scope.toggleBuddylist = (function() { |
|
|
|
$scope.toggleBuddylist = (function() { |
|
|
|
var oldState = null; |
|
|
|
var oldState = null; |
|
|
|
@ -372,8 +371,8 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte |
|
|
|
$timeout.cancel(ttlTimeout); |
|
|
|
$timeout.cancel(ttlTimeout); |
|
|
|
safeApply($scope, function(scope) { |
|
|
|
safeApply($scope, function(scope) { |
|
|
|
scope.id = scope.myid = data.Id; |
|
|
|
scope.id = scope.myid = data.Id; |
|
|
|
scope.userid = data.Userid; |
|
|
|
scope.userid = data.Userid ? data.Userid : null; |
|
|
|
scope.suserid = data.Suserid; |
|
|
|
scope.suserid = data.Suserid ? data.Suserid : null; |
|
|
|
scope.turn = data.Turn; |
|
|
|
scope.turn = data.Turn; |
|
|
|
scope.stun = data.Stun; |
|
|
|
scope.stun = data.Stun; |
|
|
|
scope.refreshWebrtcSettings(); |
|
|
|
scope.refreshWebrtcSettings(); |
|
|
|
|