From dece82791f43b5e8d278aba89cf8d6119af1478f Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 9 Apr 2012 13:11:40 -0700
Subject: - Decouple code editor from stage document switching logic - cleaning
 up

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/ninja.reel/ninja.html')

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index ead7f576..5862cf61 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -348,6 +348,11 @@
                 }
             },
 
+            "codeEditorController": {
+                "module": "js/controllers/code-editor-controller",
+                "name": "CodeEditorController"
+            },
+
             "owner": {
                 "module": "js/ninja.reel",
                 "name": "Ninja",
@@ -377,6 +382,7 @@
                     "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
+                    "codeEditorController":   {"@": "codeEditorController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "panelSplitter":     {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"}
-- 
cgit v1.2.3


From c2ec390d42945d2df1aed3f2b7ff3d1aa722fce8 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 13 Apr 2012 16:51:50 -0700
Subject: - 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>
---
 js/ninja.reel/ninja.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'js/ninja.reel/ninja.html')

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


From ea4385add0e9087487ccded929c2d6674d326db8 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 18 Apr 2012 00:29:52 -0700
Subject: - collapse panels for code view, restore for design view - apply
 theme selection to all code view documents

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js/ninja.reel/ninja.html')

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 8332e5f5..529dea30 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -395,7 +395,9 @@
                     "codeEditorController":   {"@": "codeEditorController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "panelSplitter":     {"@": "splitter3"},
-                    "timelineSplitter":     {"@": "splitter4"}
+                    "timelineSplitter":     {"@": "splitter4"},
+                    "toolsSplitter":     {"@": "splitter2"},
+                    "optionsSplitter":     {"@": "splitter1"}
                 }
             }
         }
-- 
cgit v1.2.3


From 01ecdc4bda1aff7d39f429c76e57b10af6079c53 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 3 May 2012 14:42:59 -0700
Subject: using prototype in the serialization

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'js/ninja.reel/ninja.html')

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 758cd275..a9dba720 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -198,8 +198,7 @@
 
 
         "editorViewOptions": {
-                        "module": "js/code-editor/ui/code-editor-view-options.reel",
-                        "name": "CodeEditorViewOptions",
+                        "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]",
                         "properties": {
                             "element": {"#": "editorViewOptions"}
                         }
@@ -321,8 +320,7 @@
             },
 
             "codeEditorController": {
-                "module": "js/controllers/code-editor-controller",
-                "name": "CodeEditorController"
+                "prototype": "js/controllers/code-editor-controller[CodeEditorController]"
             },
 
             "owner": {
-- 
cgit v1.2.3