From 7fa0c53c14e9029d2e3960cc81edf91592fd1768 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 25 Jul 2012 12:26:20 -0700
Subject: 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>
---
 js/components/layout/document-bar.reel/document-bar.html | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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

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.
                         "label": "Preview"
                     }
                 },
+
+                "codeEditorControls":{
+                    "prototype": "js/code-editor/ui/code-editor-view-options.reel",
+                    "properties": {
+                        "element": {"#": "codeViewOptions"}
+                    }
+                },
     
                 "owner": {
                     "prototype": "js/components/layout/document-bar.reel",
@@ -85,7 +92,8 @@ POSSIBILITY OF SUCH DAMAGE.
                         "zoomControl": {"@": "hottext1"},
                         "btnDesign": {"#": "buttonDesign"},
                         "btnCode": {"#": "buttonCode"},
-                        "btnPreview": {"#": "buttonPreview"}
+                        "btnPreview": {"#": "buttonPreview"},
+                        "codeEditorControls": {"@": "codeEditorControls"}
                     }
                 }
             }
@@ -129,7 +137,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
             </section>
         
-            <div data-montage-id="disabledCondition" class="panelDisabled"></div>
+            <div data-montage-id="disabledCondition" class="panelDisabled">
+
+            </div>
+
+            <div data-montage-id="codeViewOptions" class="viewOptions"></div>
         
         </div>
         
-- 
cgit v1.2.3


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 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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

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"}
                     }
                 }
             }
-- 
cgit v1.2.3