Merge remote-tracking branch 'origin/api-platform-updates' into api-1124b

This commit is contained in:
Victor Woeltjen 2016-09-30 15:08:01 -07:00
commit 3b1fe93191
4 changed files with 10 additions and 5 deletions
platform

View File

@ -48,7 +48,7 @@ define([
"./src/directives/MCTSplitPane", "./src/directives/MCTSplitPane",
"./src/directives/MCTSplitter", "./src/directives/MCTSplitter",
"./src/directives/MCTTree", "./src/directives/MCTTree",
"./src/filters/ReverseFilter.js", "./src/filters/ReverseFilter",
"text!./res/templates/bottombar.html", "text!./res/templates/bottombar.html",
"text!./res/templates/controls/action-button.html", "text!./res/templates/controls/action-button.html",
"text!./res/templates/controls/input-filter.html", "text!./res/templates/controls/input-filter.html",

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);
} }

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");
}); });
}); });

View File

@ -145,7 +145,7 @@ define([
"name": "Real-time Table", "name": "Real-time Table",
"key": "rt-table", "key": "rt-table",
"cssclass": "icon-tabular-realtime", "cssclass": "icon-tabular-realtime",
"templateUrl": rtTableTemplate, "template": rtTableTemplate,
"needs": [ "needs": [
"telemetry" "telemetry"
], ],