aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorAnanya Sen2012-07-25 12:26:20 -0700
committerAnanya Sen2012-07-25 12:26:20 -0700
commit7fa0c53c14e9029d2e3960cc81edf91592fd1768 (patch)
treedb4449120f73539dc647fd5d331c0af7a5a50336 /js/components
parentbb2f1d0e9a559f44348e95ad726801a5031aea3a (diff)
downloadninja-7fa0c53c14e9029d2e3960cc81edf91592fd1768.tar.gz
added save for code view, fixed code view editor bug, reuse code editor options component in document bar
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/document/views/design-code.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html16
1 files changed, 14 insertions, 2 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 3e3ac936..fb505a7c 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -77,6 +77,13 @@ POSSIBILITY OF SUCH DAMAGE.
77 "label": "Preview" 77 "label": "Preview"
78 } 78 }
79 }, 79 },
80
81 "codeEditorControls":{
82 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
83 "properties": {
84 "element": {"#": "codeViewOptions"}
85 }
86 },
80 87
81 "owner": { 88 "owner": {
82 "prototype": "js/components/layout/document-bar.reel", 89 "prototype": "js/components/layout/document-bar.reel",
@@ -85,7 +92,8 @@ POSSIBILITY OF SUCH DAMAGE.
85 "zoomControl": {"@": "hottext1"}, 92 "zoomControl": {"@": "hottext1"},
86 "btnDesign": {"#": "buttonDesign"}, 93 "btnDesign": {"#": "buttonDesign"},
87 "btnCode": {"#": "buttonCode"}, 94 "btnCode": {"#": "buttonCode"},
88 "btnPreview": {"#": "buttonPreview"} 95 "btnPreview": {"#": "buttonPreview"},
96 "codeEditorControls": {"@": "codeEditorControls"}
89 } 97 }
90 } 98 }
91 } 99 }
@@ -129,7 +137,11 @@ POSSIBILITY OF SUCH DAMAGE.
129 137
130 </section> 138 </section>
131 139
132 <div data-montage-id="disabledCondition" class="panelDisabled"></div> 140 <div data-montage-id="disabledCondition" class="panelDisabled">
141
142 </div>
143
144 <div data-montage-id="codeViewOptions" class="viewOptions"></div>
133 145
134 </div> 146 </div>
135 147