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

Browse Source
This commit is contained in:
jdescottes
2015-04-14 22:36:25 +02:00
parent 3d58bcae6c 54ae52e117
commit be3d2cf20d
161 changed files with 1060 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/controller/PalettesListController.js
View File

@ -10,7 +10,6 @@
// I apologize to my future self for this one.
var NO_SCROLL_MAX_COLORS = 20;
ns.PalettesListController = function (paletteController, usedColorService) {
this.usedColorService = usedColorService;
this.paletteService = pskl.app.paletteService;
@ -39,7 +38,6 @@
$.subscribe(Events.SECONDARY_COLOR_SELECTED, this.highlightSelectedColors.bind(this));
$.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
pskl.app.shortcutService.addShortcuts(['>', 'shift+>'], this.selectNextColor_.bind(this));
pskl.app.shortcutService.addShortcut('<', this.selectPreviousColor_.bind(this));
@ -91,8 +89,8 @@
colors = palette.getColors();
}
if (colors.length > Constants.MAX_CURRENT_COLORS_DISPLAYED) {
colors = colors.slice(0, Constants.MAX_CURRENT_COLORS_DISPLAYED);
if (colors.length > Constants.MAX_PALETTE_COLORS) {
colors = colors.slice(0, Constants.MAX_PALETTE_COLORS);
}
return colors;
@ -193,7 +191,7 @@
};
ns.PalettesListController.prototype.getColorContainer_ = function (color) {
return this.colorListContainer_.querySelector('.palettes-list-color[data-color="'+color+'"]');
return this.colorListContainer_.querySelector('.palettes-list-color[data-color="' + color + '"]');
};
ns.PalettesListController.prototype.removeClass_ = function (cssClass) {
@ -207,4 +205,4 @@
this.fillPaletteList();
this.updateFromUserSettings();
};
})();
})();