diff options
author | Nivesh Rajbhandari | 2012-08-07 13:27:19 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-08-07 13:27:19 -0700 |
commit | da71ec8bf450438a4dc904cb348e548d01dfcb3f (patch) | |
tree | 36bae4f77a61c2c6690566c79d07f5b6bc2c3936 /js/components/layout/document-bar.reel/document-bar.html | |
parent | 923e760bf4a16baa82e81da6d38e671620664e8f (diff) | |
parent | 91c440a04f0108d05e663d1696027ca5601b25bc (diff) | |
download | ninja-da71ec8bf450438a4dc904cb348e548d01dfcb3f.tar.gz |
Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvas
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, 14 insertions, 12 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index 9e5e4eb2..f073b0e7 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
@@ -75,20 +75,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
75 | "element": {"#": "previewButton"}, | 75 | "element": {"#": "previewButton"}, |
76 | "identifier": "preview", | 76 | "identifier": "preview", |
77 | "label": "Preview" | 77 | "label": "Preview" |
78 | }, | 78 | } |
79 | "listeners": [ | ||
80 | { | ||
81 | "type": "action", | ||
82 | "listener": {"@": "owner"} | ||
83 | } | ||
84 | ] | ||
85 | }, | 79 | }, |
80 | |||
86 | 81 | ||
87 | "owner": { | 82 | "owner": { |
88 | "prototype": "js/components/layout/document-bar.reel", | 83 | "prototype": "js/components/layout/document-bar.reel", |
89 | "properties": { | 84 | "properties": { |
90 | "element": {"#": "documentBar"}, | 85 | "element": {"#": "documentBar"}, |
91 | "zoomControl": {"@": "hottext1"} | 86 | "zoomControl": {"@": "hottext1"}, |
87 | "btnDesign": {"#": "buttonDesign"}, | ||
88 | "btnCode": {"#": "buttonCode"}, | ||
89 | "btnPreview": {"#": "buttonPreview"} | ||
92 | } | 90 | } |
93 | } | 91 | } |
94 | } | 92 | } |
@@ -108,7 +106,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
108 | 106 | ||
109 | </section> | 107 | </section> |
110 | 108 | ||
111 | <section> | 109 | <section data-montage-id="buttonDesign"> |
112 | 110 | ||
113 | <div class="viewicon viewdesign"></div> | 111 | <div class="viewicon viewdesign"></div> |
114 | 112 | ||
@@ -116,7 +114,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
116 | 114 | ||
117 | </section> | 115 | </section> |
118 | 116 | ||
119 | <section class="inactive"> | 117 | <section data-montage-id="buttonCode"> |
120 | 118 | ||
121 | <div class="viewicon viewcode"></div> | 119 | <div class="viewicon viewcode"></div> |
122 | 120 | ||
@@ -124,7 +122,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
124 | 122 | ||
125 | </section> | 123 | </section> |
126 | 124 | ||
127 | <section class="inactive"> | 125 | <section data-montage-id="buttonPreview" class="inactive"> |
128 | 126 | ||
129 | <div class="viewicon viewPreview"></div> | 127 | <div class="viewicon viewPreview"></div> |
130 | 128 | ||
@@ -132,7 +130,11 @@ POSSIBILITY OF SUCH DAMAGE. | |||
132 | 130 | ||
133 | </section> | 131 | </section> |
134 | 132 | ||
135 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 133 | <div data-montage-id="disabledCondition" class="panelDisabled"> |
134 | |||
135 | </div> | ||
136 | |||
137 | <div data-montage-id="codeViewOptions" class="viewOptions"></div> | ||
136 | 138 | ||
137 | </div> | 139 | </div> |
138 | 140 | ||