Merge branch 'open-master' into open1223

Merge latest from master branch into topic branch for WTD-1223
2015-06-23 13:29:47 -07:00
parent 7f7759f72c 7493f76d06
commit a4ea0dd047
4 changed files with 52 additions and 7 deletions
--- a/platform/features/layout/res/templates/frame.html
+++ b/platform/features/layout/res/templates/frame.html
@@ -35,7 +35,7 @@
    </div>
    <div class="abs object-holder">
        <mct-representation key="representation.selected.key"
-                            mct-object="domainObject">
+                            mct-object="representation.selected.key && domainObject">
        </mct-representation>
    </div>
 </div>