ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-30 15:59:55 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[API] Update StyleSheetLoaderSpec

Browse Source 
...to reflect asset path details
This commit is contained in:
Victor Woeltjen 2016-09-30 10:42:48 -07:00
parent 230230aa94
commit 34e07b938d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/general/src/StyleSheetLoader.js
View File

@ -37,6 +37,8 @@ define(
* @param {object[]} stylesheets stylesheet extension definitions * @param {object[]} stylesheets stylesheet extension definitions
* @param $document Angular's jqLite-wrapped document element * @param $document Angular's jqLite-wrapped document element
* @param {string} activeTheme the theme in use * @param {string} activeTheme the theme in use
* @param {string} [assetPath] the directory relative to which
* stylesheets will be found
*/ */
function StyleSheetLoader(stylesheets, $document, activeTheme, assetPath) { function StyleSheetLoader(stylesheets, $document, activeTheme, assetPath) {
var head = $document.find('head'), var head = $document.find('head'),
@ -69,6 +71,8 @@ define(
stylesheet.theme === activeTheme; stylesheet.theme === activeTheme;
} }
assetPath = assetPath || ".";
// Add all stylesheets from extensions // Add all stylesheets from extensions
stylesheets.filter(matchesTheme).forEach(addStyleSheet); stylesheets.filter(matchesTheme).forEach(addStyleSheet);
} }

7
platform/commonUI/general/test/StyleSheetLoaderSpec.js
View File

@ -69,7 +69,7 @@ define(
it("adjusts link locations", function () { it("adjusts link locations", function () {
expect(mockElement.setAttribute) expect(mockElement.setAttribute)
.toHaveBeenCalledWith('href', "a/b/c/d.css"); .toHaveBeenCalledWith('href', "./a/b/c/d.css");
}); });
describe("for themed stylesheets", function () { describe("for themed stylesheets", function () {
@ -95,12 +95,13 @@ define(
it("includes matching themes", function () { it("includes matching themes", function () {
expect(mockElement.setAttribute) expect(mockElement.setAttribute)
.toHaveBeenCalledWith('href', "a/b/c/themed.css"); .toHaveBeenCalledWith('href', "./a/b/c/themed.css");
}); });
it("excludes mismatching themes", function () { it("excludes mismatching themes", function () {
expect(mockElement.setAttribute) expect(mockElement.setAttribute)
.not.toHaveBeenCalledWith('href', "a/b/c/bad-theme.css"); .not
.toHaveBeenCalledWith('href', "./a/b/c/bad-theme.css");
}); });
}); });