diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index a26b2d4d4..e995aa399 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -1,18 +1,11 @@ -
- - -
+

- +
-
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 7aa84db56..5caa2d42b 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -2,30 +2,35 @@ angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $timeout, $log, configService, profileService, go) { - var config = configService.getSync(); - this.colorOpts = [ - '#DD4B39', - '#F38F12', - '#FAA77F', - '#D0B136', - '#9EDD72', - '#29BB9C', - '#019477', - '#77DADA', - '#4A90E2', - '#484ED3', - '#9B59B6', - '#E856EF', - '#FF599E', - '#7A8C9E', - ]; - + var config; var fc = profileService.focusedClient; var walletId = fc.credentials.walletId; - var config = configService.getSync(); - config.colorFor = config.colorFor || {}; - this.color = config.colorFor[walletId] || '#4A90E2'; + this.init = function() { + this.colorList = [ + '#DD4B39', + '#F38F12', + '#FAA77F', + '#D0B136', + '#9EDD72', + '#29BB9C', + '#019477', + '#77DADA', + '#4A90E2', + '#484ED3', + '#9B59B6', + '#E856EF', + '#FF599E', + '#7A8C9E', + ]; + + config = configService.getSync(); + config.colorFor = config.colorFor || {}; + + $scope.data = { + currentColor: config.colorFor[walletId] || '#4A90E2' + }; + }; this.save = function(color) { var self = this; @@ -35,13 +40,9 @@ angular.module('copayApp.controllers').controller('preferencesColorController', opts.colorFor[walletId] = color; configService.set(opts, function(err) { - if (err) $log.warn(err); go.preferences(); + if (err) $log.warn(err); $scope.$emit('Local/ColorUpdated'); - $timeout(function() { - $scope.$apply(); - }, 100); }); - }; });