Merge remote-tracking branch 'origin/open199e' into open199

2015-12-08 15:17:36 -08:00
parent 4419a101d6 6502d36c7a
commit 55ea7a285e
5 changed files with 551 additions and 273 deletions
--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@@ -24,9 +24,7 @@
                 class="flex-elem holder"
                 ng-model="filterBy">
    </mct-include>
-    <div>{{searchText}}</div>
    <div class="current-elements abs" style="height: 100%;">
-        <!--p class="hint">Drop objects here to add them...</p-->
        <ul class="tree">
            <li ng-repeat="containedObject in composition | filter:searchText">
                <span class="tree-item">