tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #553 from glowing-bear/fix-settings

Browse source 
Fix settings
This commit is contained in:
Lorenz Hübschle-Schneider 2015-03-02 22:29:22 +01:00
commit 5619420302
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
js/glowingbear.js
View file

@ -281,6 +281,15 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
settings.password = ''; settings.password = '';
} }
// Check if user decides to save password, and copy it over
settings.addCallback('savepassword', function(newvalue) {
if (settings.savepassword) {
// Init value in settings module
settings.setDefaults({'password': $scope.password});
settings.password = $scope.password;
}
});
$rootScope.wasMobileUi = false; $rootScope.wasMobileUi = false;
if (utils.isMobileUi()) { if (utils.isMobileUi()) {
$rootScope.wasMobileUi = true; $rootScope.wasMobileUi = true;

3
js/settings.js
View file

@ -57,6 +57,9 @@ weechat.factory('settings', ['$store', '$rootScope', function($store, $rootScope
for (var key in defaults) { for (var key in defaults) {
// null means the key isn't set // null means the key isn't set
if ($store.get(key) === null) { if ($store.get(key) === null) {
// Define property so it will get saved to store
defineProperty(key);
// Save to settings module AND to store
this[key] = defaults[key]; this[key] = defaults[key];
} }
} }