diff options
author | Valerio Virgillito | 2012-03-12 16:25:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-12 16:25:47 -0700 |
commit | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (patch) | |
tree | a0be6ee1daa3e21ed7df483721bc3116e4c20006 /js/components/layout/document-bar.reel/document-bar.html | |
parent | ac2db49e51f82f5a1cf52ec854b047e007ffbdd7 (diff) | |
download | ninja-c24f58c10231c30d3a8a4c9fb9a4f395dd746180.tar.gz |
Merge dhg637 DisabledState into master.
Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index 5a4ca2be..bd13f231 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
@@ -32,19 +32,8 @@ | |||
32 | } | 32 | } |
33 | }, | 33 | }, |
34 | 34 | ||
35 | "owner": { | 35 | "disable": { |
36 | "module": "js/components/layout/document-bar.reel", | 36 | "prototype": "montage/ui/condition.reel", |
37 | "name": "DocumentBar", | ||
38 | "properties": { | ||
39 | "element": {"#": "documentBar"}, | ||
40 | "designView": {"#": "design"}, | ||
41 | "codeView": {"#": "code"}, | ||
42 | "zoomControl": {"@": "hottext1"} | ||
43 | } | ||
44 | }, | ||
45 | "Disable": { | ||
46 | "module": "montage/ui/condition.reel", | ||
47 | "name": "Condition", | ||
48 | "properties": { | 37 | "properties": { |
49 | "element": {"#": "disabledCondition"} | 38 | "element": {"#": "disabledCondition"} |
50 | }, | 39 | }, |
@@ -55,6 +44,17 @@ | |||
55 | "oneway": true | 44 | "oneway": true |
56 | } | 45 | } |
57 | } | 46 | } |
47 | }, | ||
48 | |||
49 | "owner": { | ||
50 | "module": "js/components/layout/document-bar.reel", | ||
51 | "name": "DocumentBar", | ||
52 | "properties": { | ||
53 | "element": {"#": "documentBar"}, | ||
54 | "designView": {"#": "design"}, | ||
55 | "codeView": {"#": "code"}, | ||
56 | "zoomControl": {"@": "hottext1"} | ||
57 | } | ||
58 | } | 58 | } |
59 | } | 59 | } |
60 | </script> | 60 | </script> |