alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into nem468a.

Browse Source 
Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
This commit is contained in:
Charles Hacskaylo
2016-01-11 13:29:26 -08:00
parent a65ca7cb1e 9cc03123b1
commit 4f7ca98b60
72 changed files with 4215 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/representation/src/TemplatePrefetcher.js
View File

@@ -30,7 +30,7 @@ define(
* @param {platform/representation.TemplateLinker} templateLinker
* the `templateLinker` service, used to load and cache
* template extensions
* @param {...{templateUrl: string}[]} extensions arrays
* @param {...Array.<{templateUrl: string}>} extensions arrays
* of template or template-like extensions
*/
function TemplatePrefetcher(templateLinker, extensions) {