Browse Source

Fixed auto open of settings when no displayName is set.

pull/32/head
Simon Eisenmann 11 years ago
parent
commit
05dbd4459d
  1. 2
      static/js/controllers/mediastreamcontroller.js
  2. 2
      static/js/directives/usability.js

2
static/js/controllers/mediastreamcontroller.js

@ -352,7 +352,7 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function
$scope.user = $.extend(true, {}, $scope.master, storedUser); $scope.user = $.extend(true, {}, $scope.master, storedUser);
$scope.user.settings = $.extend(true, {}, $scope.user.settings, $scope.master.settings, $scope.user.settings); $scope.user.settings = $.extend(true, {}, $scope.user.settings, $scope.master.settings, $scope.user.settings);
$scope.update($scope.user, true); $scope.update($scope.user, true);
$scope.loadedUser = true; $scope.loadedUser = storedUser.displayName && true;
// Add room definition to root to be availale on initial connect. // Add room definition to root to be availale on initial connect.
$rootScope.roomid = $scope.user.settings.defaultRoom || ""; $rootScope.roomid = $scope.user.settings.defaultRoom || "";
} }

2
static/js/directives/usability.js

@ -53,7 +53,7 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
ctrl.setInfo("denied"); ctrl.setInfo("denied");
} }
// Check if we should show settings per default. // Check if we should show settings per default.
$scope.$parent.showSettings = $scope.loadedUser ? 0 : 1; $scope.layout.settings = $scope.loadedUser ? false : true;
}); });
}; };

Loading…
Cancel
Save