diff --git a/src/js/controller/PaletteController.js b/src/js/controller/PaletteController.js index a3892348..112d20ab 100644 --- a/src/js/controller/PaletteController.js +++ b/src/js/controller/PaletteController.js @@ -92,7 +92,8 @@ }; ns.PaletteController.prototype.resetColors = function () { - pskl.app.selectedColorsService.reset(); + this.setPrimaryColor_(Constants.DEFAULT_PEN_COLOR); + this.setSecondaryColor_(Constants.TRANSPARENT_COLOR); }; /** diff --git a/src/js/service/SelectedColorsService.js b/src/js/service/SelectedColorsService.js index fa049f1b..97fe86b6 100644 --- a/src/js/service/SelectedColorsService.js +++ b/src/js/service/SelectedColorsService.js @@ -2,7 +2,8 @@ var ns = $.namespace('pskl.service'); ns.SelectedColorsService = function () { - this.reset(); + this.primaryColor_ = Constants.DEFAULT_PEN_COLOR; + this.secondaryColor_ = Constants.TRANSPARENT_COLOR; }; ns.SelectedColorsService.prototype.init = function () { @@ -18,11 +19,6 @@ return this.secondaryColor_; }; - ns.SelectedColorsService.prototype.reset = function () { - this.primaryColor_ = Constants.DEFAULT_PEN_COLOR; - this.secondaryColor_ = Constants.TRANSPARENT_COLOR; - }; - ns.SelectedColorsService.prototype.onPrimaryColorUpdate_ = function (evt, color) { this.primaryColor_ = color; };