aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel/document-bar.html
diff options
context:
space:
mode:
authorAnanya Sen2012-07-25 12:28:58 -0700
committerAnanya Sen2012-07-25 12:28:58 -0700
commitfa2e82cf10aaa4900a462410cbb99b5b0433a1b1 (patch)
treeb7168d4dcd92a4d8a0692941b4688a92914bee51 /js/components/layout/document-bar.reel/document-bar.html
parent0262cbeccef538d3aa125eb7cd16d8ca758c82b1 (diff)
downloadninja-fa2e82cf10aaa4900a462410cbb99b5b0433a1b1.tar.gz
fixing code editor double vertical scrollbar bug
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/layout/document-bar.reel/document-bar.html')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html9
1 files changed, 1 insertions, 8 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index fb505a7c..f073b0e7 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -78,12 +78,6 @@ POSSIBILITY OF SUCH DAMAGE.
78 } 78 }
79 }, 79 },
80 80
81 "codeEditorControls":{
82 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
83 "properties": {
84 "element": {"#": "codeViewOptions"}
85 }
86 },
87 81
88 "owner": { 82 "owner": {
89 "prototype": "js/components/layout/document-bar.reel", 83 "prototype": "js/components/layout/document-bar.reel",
@@ -92,8 +86,7 @@ POSSIBILITY OF SUCH DAMAGE.
92 "zoomControl": {"@": "hottext1"}, 86 "zoomControl": {"@": "hottext1"},
93 "btnDesign": {"#": "buttonDesign"}, 87 "btnDesign": {"#": "buttonDesign"},
94 "btnCode": {"#": "buttonCode"}, 88 "btnCode": {"#": "buttonCode"},
95 "btnPreview": {"#": "buttonPreview"}, 89 "btnPreview": {"#": "buttonPreview"}
96 "codeEditorControls": {"@": "codeEditorControls"}
97 } 90 }
98 } 91 }
99 } 92 }