From 77b56bf5bb7f749a96c433a4b8be78e41a109e07 Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Thu, 28 Aug 2014 19:55:08 +0200 Subject: [PATCH] Avoid to send status data twice on connect. --- static/js/controllers/mediastreamcontroller.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js index 19d3d1fc..17d28491 100644 --- a/static/js/controllers/mediastreamcontroller.js +++ b/static/js/controllers/mediastreamcontroller.js @@ -159,10 +159,15 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte // Data voids. var cache = {}; var resurrect = null; + var reconnecting = false; + var connected = false; + var autoreconnect = true; $scope.update = function(user, noRefresh) { $scope.master = angular.copy(user); - $scope.updateStatus(); + if (connected) { + $scope.updateStatus(); + } if (!noRefresh) { $scope.refreshWebrtcSettings(); } @@ -190,9 +195,9 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte message: $scope.master.message || null } if (_.isEqual(status, cache.status)) { - console.log("Status update skipped, as status has not changed.") + //console.log("Status update skipped, as status has not changed.") } else { - console.log("Updating own status", status); + console.log("Updating own status", JSON.stringify(status), JSON.stringify(cache.status)); mediaStream.api.updateStatus(status); cache.status = _.clone(status); } @@ -523,10 +528,6 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte alertify.dialog.alert(translation._("Oops") + "
" + message); }); - var reconnecting = false; - var connected = false; - var autoreconnect = true; - var reconnect = function() { if (connected && autoreconnect) { if (resurrect === null) {