diff options
author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
tree | 632484428b398f71b8481aa8e30180895ff2483c /js/components/layout/document-bar.reel/document-bar.html | |
parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 15 |
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 |