From 0306ac07b227c2cedff871fd66cbfe862c82e1fa Mon Sep 17 00:00:00 2001 From: Jagmeet Bhamber Date: Tue, 6 Nov 2018 17:00:18 -0500 Subject: [PATCH] fix(theme): prepend # to hex codes enableBrowserColor (#11492) check for leading # and prepend update enableBrowserColor tests Fixes #11259 --- src/core/services/theming/theming.js | 1 + src/core/services/theming/theming.spec.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/services/theming/theming.js b/src/core/services/theming/theming.js index 6f25ab51575..91abd92aa55 100644 --- a/src/core/services/theming/theming.js +++ b/src/core/services/theming/theming.js @@ -281,6 +281,7 @@ function ThemingProvider($mdColorPalette, $$mdMetaProvider) { PALETTES[THEMES[theme].colors[options.palette || 'primary'].name]; var color = angular.isObject(palette[hue]) ? palette[hue].hex : palette[hue]; + if (color.substr(0, 1) !== '#') color = '#' + color; return setBrowserColor(color); }; diff --git a/src/core/services/theming/theming.spec.js b/src/core/services/theming/theming.spec.js index 1a61663558e..4b79c9d3295 100644 --- a/src/core/services/theming/theming.spec.js +++ b/src/core/services/theming/theming.spec.js @@ -363,7 +363,7 @@ describe('$mdThemingProvider', function() { it('should use default primary color at the meta tag', function () { var name = 'theme-color'; - var content = themingProvider._PALETTES.testPalette['800'].hex; + var content = '#' + themingProvider._PALETTES.testPalette['800'].hex; expect(document.getElementsByName(name).length).toBe(0); @@ -378,7 +378,7 @@ describe('$mdThemingProvider', function() { var hue = '200'; - var content = themingProvider._PALETTES.testPalette[hue].hex; + var content = '#' + themingProvider._PALETTES.testPalette[hue].hex; expect(document.getElementsByName(name).length).toBe(0); @@ -404,7 +404,7 @@ describe('$mdThemingProvider', function() { it('should use test theme', function () { var name = 'theme-color'; - var content = themingProvider._PALETTES.testPalette['800'].hex; + var content = '#' + themingProvider._PALETTES.testPalette['800'].hex; expect(document.getElementsByName(name).length).toBe(0);