From fa2e82cf10aaa4900a462410cbb99b5b0433a1b1 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 25 Jul 2012 12:28:58 -0700
Subject: 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>
---
 js/components/layout/document-bar.reel/document-bar.html | 9 +--------
 js/components/layout/document-bar.reel/document-bar.js   | 6 ++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'js/components/layout/document-bar.reel')

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.
                     }
                 },
 
-                "codeEditorControls":{
-                    "prototype": "js/code-editor/ui/code-editor-view-options.reel",
-                    "properties": {
-                        "element": {"#": "codeViewOptions"}
-                    }
-                },
     
                 "owner": {
                     "prototype": "js/components/layout/document-bar.reel",
@@ -92,8 +86,7 @@ POSSIBILITY OF SUCH DAMAGE.
                         "zoomControl": {"@": "hottext1"},
                         "btnDesign": {"#": "buttonDesign"},
                         "btnCode": {"#": "buttonCode"},
-                        "btnPreview": {"#": "buttonPreview"},
-                        "codeEditorControls": {"@": "codeEditorControls"}
+                        "btnPreview": {"#": "buttonPreview"}
                     }
                 }
             }
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index bf84c652..c1d77668 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -217,6 +217,9 @@ exports.DocumentBar = Montage.create(Component, {
         value: function () {
             //
             this.showView('design', this.renderDesignView, this.btnDesign, this.btnCode);
+
+            //todo - temp
+            this.application.ninja.documentBar.codeEditorControls.visible = false;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -225,6 +228,9 @@ exports.DocumentBar = Montage.create(Component, {
         value: function () {
             //
             this.showView('code', this.renderCodeView, this.btnCode, this.btnDesign);
+
+            //todo - temp
+            this.application.ninja.documentBar.codeEditorControls.visible = true;
         }
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3