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

Merge branch 'open877' into open879

Browse Source 
Merge fixed position view work and general toolbar
work to begin adding toolbars for fixed position view,
WTD-879."

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
This commit is contained in:
Victor Woeltjen
2015-02-17 15:58:36 -08:00
parent 3916968544 0510705f3a
commit 98caa31d7b
12 changed files with 666 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/edit/res/templates/edit-object.html
View File

@@ -12,7 +12,7 @@
<div class='holder abs object-holder'>
<mct-representation key="representation.selected.key"
toolbar="toolbar"
mct-object="domainObject">
mct-object="representation.selected.key && domainObject">
</mct-representation>
</div>
</div>