starred/stf-DeviceFarmer-1
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 16:23:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug for realtime browser uninstalling.

Browse Source
This commit is contained in:
Gunther Brunner
2014-05-01 20:39:27 +09:00
parent 069a1fd0da
commit e6be8491fa
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/app/control-panes/dashboard/navigation/navigation-controller.js
View File

@@ -45,28 +45,28 @@ module.exports = function NavigationCtrl($scope, $rootScope) {
}
function setCurrentBrowser(device) {
if (device && device.browser && device.browser.apps) {
function setCurrentBrowser(browser) {
if (browser && browser.apps) {
var currentBrowser = {}
if (device.browser.selected) {
var selectedBrowser = _.first(device.browser.apps, 'selected')
if (browser.selected) {
var selectedBrowser = _.first(browser.apps, 'selected')
if (!_.isEmpty(selectedBrowser)) {
currentBrowser = selectedBrowser[0]
}
} else {
currentBrowser = _.first(device.browser.apps)
currentBrowser = _.first(browser.apps)
}
$rootScope.browser = currentBrowser
}
}
setCurrentBrowser($scope.device)
setCurrentBrowser($scope.device ? $scope.device.browser : null)
$scope.$watch('device', function (newValue, oldValue) {
$scope.$watch('device.browser', function (newValue, oldValue) {
if (newValue !== oldValue) {
setCurrentBrowser(newValue)
}
})
}, true)
$scope.clearSettings = function () {
var browser = $scope.browser