mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #605 from Sal0hcine/fix-reset-default-colours

Browse Source 
Pressing "d" for default colors doesn't fully work. #601
This commit is contained in:
Julian Descottes 2017-01-05 11:44:49 +01:00 committed by GitHub
commit 61c76f980a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/controller/PaletteController.js
View File

@ -92,7 +92,8 @@
}; };
ns.PaletteController.prototype.resetColors = function () { ns.PaletteController.prototype.resetColors = function () {
pskl.app.selectedColorsService.reset(); this.setPrimaryColor_(Constants.DEFAULT_PEN_COLOR);
this.setSecondaryColor_(Constants.TRANSPARENT_COLOR);
}; };
/** /**

8
src/js/service/SelectedColorsService.js
View File

@ -2,7 +2,8 @@
var ns = $.namespace('pskl.service'); var ns = $.namespace('pskl.service');
ns.SelectedColorsService = function () { ns.SelectedColorsService = function () {
this.reset(); this.primaryColor_ = Constants.DEFAULT_PEN_COLOR;
this.secondaryColor_ = Constants.TRANSPARENT_COLOR;
}; };
ns.SelectedColorsService.prototype.init = function () { ns.SelectedColorsService.prototype.init = function () {
@ -18,11 +19,6 @@
return this.secondaryColor_; 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) { ns.SelectedColorsService.prototype.onPrimaryColorUpdate_ = function (evt, color) {
this.primaryColor_ = color; this.primaryColor_ = color;
}; };