Merge pull request #1213 from nasa/api-platform-updates

[API] Miscellaneous platform updates

platform/commonUI/browse/bundle.js

@@ -41,6 +41,7 @@ define([
     "text!./res/templates/items/items.html",
     "text!./res/templates/browse/object-properties.html",
     "text!./res/templates/browse/inspector-region.html",
+    "text!./res/templates/view-object.html",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -63,6 +64,7 @@ define([
     itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
+    viewObjectTemplate,
     legacyRegistry
 ) {
 
@@ -142,7 +144,7 @@ define([
             "representations": [
                 {
                     "key": "view-object",
-                    "templateUrl": "templates/view-object.html"
+                    "template": viewObjectTemplate
                 },
                 {
                     "key": "browse-object",

platform/commonUI/general/bundle.js

@@ -48,6 +48,7 @@ define([
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
     "./src/directives/MCTTree",
+    "./src/filters/ReverseFilter",
     "text!./res/templates/bottombar.html",
     "text!./res/templates/controls/action-button.html",
     "text!./res/templates/controls/input-filter.html",
@@ -96,6 +97,7 @@ define([
     MCTSplitPane,
     MCTSplitter,
     MCTTree,
+    ReverseFilter,
     bottombarTemplate,
     actionButtonTemplate,
     inputFilterTemplate,
@@ -146,7 +148,8 @@ define([
                     "depends": [
                         "stylesheets[]",
                         "$document",
-                        "THEME"
+                        "THEME",
+                        "ASSETS_PATH"
                     ]
                 },
                 {
@@ -158,7 +161,7 @@ define([
             ],
             "filters": [
                 {
-                    "implementation": "filters/ReverseFilter.js",
+                    "implementation": ReverseFilter,
                     "key": "reverse"
                 }
             ],
@@ -405,6 +408,11 @@ define([
                     "key": "THEME",
                     "value": "unspecified",
                     "priority": "fallback"
+                },
+                {
+                    "key": "ASSETS_PATH",
+                    "value": ".",
+                    "priority": "fallback"
                 }
             ],
             "containers": [

platform/commonUI/general/src/StyleSheetLoader.js

@@ -37,8 +37,10 @@ define(
          * @param {object[]} stylesheets stylesheet extension definitions
          * @param $document Angular's jqLite-wrapped document element
          * @param {string} activeTheme the theme in use
+         * @param {string} [assetPath] the directory relative to which
+         *        stylesheets will be found
          */
-        function StyleSheetLoader(stylesheets, $document, activeTheme) {
+        function StyleSheetLoader(stylesheets, $document, activeTheme, assetPath) {
             var head = $document.find('head'),
                 document = $document[0];
 
@@ -47,6 +49,7 @@ define(
                 // Create a link element, and construct full path
                 var link = document.createElement('link'),
                     path = [
+                        assetPath,
                         stylesheet.bundle.path,
                         stylesheet.bundle.resources,
                         stylesheet.stylesheetUrl
@@ -68,6 +71,8 @@ define(
                     stylesheet.theme === activeTheme;
             }
 
+            assetPath = assetPath || ".";
+
             // Add all stylesheets from extensions
             stylesheets.filter(matchesTheme).forEach(addStyleSheet);
         }

platform/commonUI/general/test/StyleSheetLoaderSpec.js

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