Browse Source

Fixed load of stored settings when not logged in.

pull/94/merge
Simon Eisenmann 11 years ago
parent
commit
5932f70e0d
  1. 3
      static/js/controllers/mediastreamcontroller.js
  2. 5
      static/js/services/mediastream.js

3
static/js/controllers/mediastreamcontroller.js

@ -459,6 +459,9 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapte
// Unmark authorization process. // Unmark authorization process.
if (data.Userid) { if (data.Userid) {
mediaStream.users.authorizing(false); mediaStream.users.authorizing(false);
} else if (!mediaStream.users.authorizing()) {
// Trigger user data load when not in authorizing phase.
$scope.loadUserSettings();
} }
// Always apply room after self received to avoid double stuff. // Always apply room after self received to avoid double stuff.

5
static/js/services/mediastream.js

@ -137,7 +137,10 @@ define([
}, },
authorizing: function(value) { authorizing: function(value) {
// Boolean flag to indicate that an authentication is currently in progress. // Boolean flag to indicate that an authentication is currently in progress.
authorizing = !!value; if (typeof(value) !== "undefined") {
authorizing = !!value;
}
return authorizing;
}, },
authorize: function(data, success_cb, error_cb) { authorize: function(data, success_cb, error_cb) {
mediaStream.users.authorizing(true); mediaStream.users.authorizing(true);

Loading…
Cancel
Save