- code editor view options bar

- Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete
- font zoom hottext

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 5862cf61..8332e5f5 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -214,6 +214,15 @@
                 }
             },
 
+
+        "editorViewOptions": {
+                        "module": "js/code-editor/ui/code-editor-view-options.reel",
+                        "name": "CodeEditorViewOptions",
+                        "properties": {
+                            "element": {"#": "editorViewOptions"}
+                        }
+                    },
+
             "panelContainer": {
                 "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
@@ -379,6 +388,7 @@
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":                {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
+                    "editorViewOptions":    {"@": "editorViewOptions"},
                     "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
@@ -443,7 +453,8 @@
                         <section id="timelineResizer" class="timelineResizer resizeBar"></section>
                         <section id="stateBar">
                             <section id="documentBarContainer">
-                                <div id="documentBar" class="documentBar"><a href="#">HTML</a></div>
+                                <div id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div>
+                                <div id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div>
                             </section>
                         </section>