Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 15 insertions, 0 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index f2368e9a..413f588d 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -60,6 +60,20 @@
                             "oneway": true
                         }
                     }
+                },
+
+                "disable": {
+                    "prototype": "montage/ui/condition.reel",
+                    "properties": {
+                        "element": {"#": "disabledCondition"}
+                    },
+                    "bindings": {
+                        "condition": {
+                            "boundObject": {"@": "owner"},
+                            "boundObjectPropertyPath": "disabled",
+                            "oneway": true
+                        }
+                    }
                 }
             }
         </script>
@@ -71,6 +85,7 @@
             <div id="breadcrumb_container">
                 <button id="breadcrumb_button" class="nj-skinned"></button>
             </div>
+            <div id="disabledCondition" class="panelDisabled"></div>
         </section>
 
     </body>