From cfb846b6de4168701102b793226a8e05b15321ea Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Sun, 11 May 2014 11:55:00 +0200 Subject: [PATCH] Moved hardcoded values to constants in PaletteListController --- src/css/toolbox-palettes-list.css | 3 --- src/js/controller/PalettesListController.js | 15 ++++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/css/toolbox-palettes-list.css b/src/css/toolbox-palettes-list.css index b02e24fe..2d8aa477 100644 --- a/src/css/toolbox-palettes-list.css +++ b/src/css/toolbox-palettes-list.css @@ -1,6 +1,3 @@ -.palettes-list-container { -} - .palettes-list-select { float:right; max-width:90px; diff --git a/src/js/controller/PalettesListController.js b/src/js/controller/PalettesListController.js index efbe9acd..31c3f65a 100644 --- a/src/js/controller/PalettesListController.js +++ b/src/js/controller/PalettesListController.js @@ -4,6 +4,12 @@ var PRIMARY_COLOR_CLASSNAME = 'palettes-list-primary-color'; var SECONDARY_COLOR_CLASSNAME = 'palettes-list-secondary-color'; + var HAS_SCROLL_CLASSNAME = 'palettes-list-has-scrollbar'; + // well ... I know that if there are more than 20 colors, a scrollbar will be displayed + // It's linked to the max-height: 160px; defined in toolbox-palette-list.css ! + // I apologize to my future self for this one. + var NO_SCROLL_MAX_COLORS = 20; + ns.PalettesListController = function (paletteController, usedColorService) { this.usedColorService = usedColorService; this.paletteController = paletteController; @@ -52,11 +58,11 @@ this.highlightSelectedColors(); - var hasScrollbar = colors.length > 20; + var hasScrollbar = colors.length > NO_SCROLL_MAX_COLORS; if (hasScrollbar && !pskl.utils.UserAgent.isChrome) { - this.colorListContainer_.classList.add('palettes-list-has-scrollbar'); + this.colorListContainer_.classList.add(HAS_SCROLL_CLASSNAME); } else { - this.colorListContainer_.classList.remove('palettes-list-has-scrollbar'); + this.colorListContainer_.classList.remove(HAS_SCROLL_CLASSNAME); } }; @@ -84,7 +90,7 @@ ns.PalettesListController.prototype.onPaletteSelected_ = function (evt) { var paletteId = this.colorPaletteSelect_.value; - if (paletteId === Constants.PALETTE_MANAGE_ID) { + if (paletteId === Constants.MANAGE_PALETTE_ID) { $.publish(Events.DIALOG_DISPLAY, 'manage-palettes'); this.selectPaletteFromUserSettings(); } else { @@ -117,7 +123,6 @@ this.removeClass_(PRIMARY_COLOR_CLASSNAME); this.removeClass_(SECONDARY_COLOR_CLASSNAME); - var colorContainer = this.getColorContainer_(this.paletteController.getSecondaryColor()); if (colorContainer) { colorContainer.classList.remove(PRIMARY_COLOR_CLASSNAME);