Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(theming): fix read-only $mdThemingProvider.configuration() #9389

Merged
merged 1 commit into from
Aug 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/core/services/theming/theming.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,15 @@ function ThemingProvider($mdColorPalette, $$mdMetaProvider) {
extendPalette: extendPalette,
theme: registerTheme,

/**
* return a read-only clone of the current theme configuration
*/
configuration : function() {
// return a read-only clone of the current configuration
var locals = { defaultTheme : defaultTheme, alwaysWatchTheme : alwaysWatchTheme };
return angular.extend( { }, config, locals );
return angular.extend( { }, themeConfig, {
defaultTheme : defaultTheme,
alwaysWatchTheme : alwaysWatchTheme,
registeredStyles : [].concat(themeConfig.registeredStyles)
});
},

/**
Expand Down
38 changes: 38 additions & 0 deletions src/core/services/theming/theming.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,44 @@ describe('$mdThemingProvider', function() {
expect(angular.element(document.getElementsByName(name)[0]).attr('content')).toBe(content);
});
})

describe('configuration', function () {
beforeEach(function () {
module('material.core', function($mdThemingProvider) {
themingProvider = $mdThemingProvider;
});
startAngular();
});

it('should have access to read-only configuration', function () {
var config = themingProvider.configuration();

expect(config.disableTheming).toBe(false);
expect(config.generateOnDemand).toBe(false);
expect(config.registeredStyles.length).toBe(0);
expect(config.nonce).toBe(null);
expect(config.alwaysWatchTheme).toBe(false);

// Change local copies
config.disableTheming = true;
config.generateOnDemand = true;
config.registeredStyles.push("Something");
config.nonce = 'myNonce';
config.alwaysWatchTheme = true;

var config2 = themingProvider.configuration();

// Confirm master versions are not altered
expect(config2.disableTheming).toBe(false);
expect(config2.generateOnDemand).toBe(false);
expect(config2.registeredStyles.length).toBe(0);
expect(config2.nonce).toBe(null);
expect(config2.alwaysWatchTheme).toBe(false);

});


})
});

describe('$mdThemeProvider with custom styles', function() {
Expand Down