safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-30 00:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-586: Ensure model is set prior to region in time zone field.

Browse Source
This commit is contained in:
Michael Jumper
2015-08-28 22:57:57 -07:00
parent cff2b7a857
commit 83318d9c68
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js
View File

@@ -697,15 +697,15 @@ angular.module('form').controller('timeZoneFieldController', ['$scope', '$inject
*/ */
$scope.region = ''; $scope.region = '';
// Restore time zone selection when region changes
$scope.$watch('region', function restoreSelection(region) {
$scope.model = selectedTimeZone[region] || null;
});
// Ensure corresponding region is selected // Ensure corresponding region is selected
$scope.$watch('model', function setModel(model) { $scope.$watch('model', function setModel(model) {
$scope.region = timeZoneRegions[model] || ''; $scope.region = timeZoneRegions[model] || '';
selectedTimeZone[$scope.region] = model; selectedTimeZone[$scope.region] = model;
}); });
// Restore time zone selection when region changes
$scope.$watch('region', function restoreSelection(region) {
$scope.model = selectedTimeZone[region] || null;
});
}]); }]);