Merge branch 'refs/heads/SerialKiller' into TimelineUber

1 files changed, 17 insertions, 3 deletions

diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 04e2930a..43b87940 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -113,6 +113,21 @@
                 }
             },
 
+            "disabledCondition": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
+
             "owner": {
                 "module": "js/panels/Panel.reel",
                 "name": "Panel",
@@ -136,9 +151,8 @@
     </div>
     <div class="panelBody">
         <div class="panelBodyContent">
-            <div id="panelObject" class="panelObjects">
-
-            </div>
+            <div id="disabledCondition" class="panelDisabled"></div>
+            <div id="panelObject" class="panelObjects"></div>
         </div>
     </div>
     <div id="resizeBar" class="resizeBar"></div>