aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel/document-bar.html
diff options
context:
space:
mode:
authorEric Guzman2012-03-13 13:12:43 -0700
committerEric Guzman2012-03-13 13:12:43 -0700
commit61fd46cad105f0a52afa028e5301b96120f00ab4 (patch)
treed8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/components/layout/document-bar.reel/document-bar.html
parent7e3161153b87b891875ac65368a19aed12909fa3 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html15
1 files changed, 15 insertions, 0 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 48f1423c..bd13f231 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -32,6 +32,20 @@
32 } 32 }
33 }, 33 },
34 34
35 "disable": {
36 "prototype": "montage/ui/condition.reel",
37 "properties": {
38 "element": {"#": "disabledCondition"}
39 },
40 "bindings": {
41 "condition": {
42 "boundObject": {"@": "owner"},
43 "boundObjectPropertyPath": "disabled",
44 "oneway": true
45 }
46 }
47 },
48
35 "owner": { 49 "owner": {
36 "module": "js/components/layout/document-bar.reel", 50 "module": "js/components/layout/document-bar.reel",
37 "name": "DocumentBar", 51 "name": "DocumentBar",
@@ -53,6 +67,7 @@
53 <input class="zoomHotText label" id="zoomControlHT"/> 67 <input class="zoomHotText label" id="zoomControlHT"/>
54 <span class="design-view disable" id="design">Design View</span> 68 <span class="design-view disable" id="design">Design View</span>
55 <span class="code-view disable" id="code">Code View</span> 69 <span class="code-view disable" id="code">Code View</span>
70 <div id="disabledCondition" class="panelDisabled"></div>
56 </div> 71 </div>
57</body> 72</body>
58</html> \ No newline at end of file 73</html> \ No newline at end of file