safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from glyptodon/update-defaults

Browse Source 
GUAC-1053: Ensure new preferences are set even if the user already had preferences from an older version.
This commit is contained in:
James Muehlner
2015-04-23 11:24:42 -07:00
parent 07789a08ac b114dbaf01
commit 9c2415880c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/webapp/app/settings/services/preferenceService.js
View File

@@ -127,7 +127,7 @@ angular.module('settings').factory('preferenceService', ['$injector',
if (localStorage) {
var preferencesJSON = localStorage.getItem(GUAC_PREFERENCES_STORAGE_KEY);
if (preferencesJSON)
service.preferences = JSON.parse(preferencesJSON);
angular.extend(service.preferences, JSON.parse(preferencesJSON));
}
}