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


From fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 16:18:00 -0700
Subject: Code reformatting

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/ninja.reel/ninja.html | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a9dba720..34dc8135 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -196,13 +196,12 @@
                 }
             },
 
-
-        "editorViewOptions": {
-                        "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]",
-                        "properties": {
-                            "element": {"#": "editorViewOptions"}
-                        }
-                    },
+            "editorViewOptions": {
+                "prototype": "js/code-editor/ui/code-editor-view-options.reel",
+                "properties": {
+                    "element": {"#": "editorViewOptions"}
+                }
+            },
 
             "panelContainer": {
                 "prototype": "js/panels/PanelContainer.reel",
@@ -270,7 +269,6 @@
                         "oneway": true
                     }
                 }
-
             },
 
             "documentController1": {
@@ -320,7 +318,7 @@
             },
 
             "codeEditorController": {
-                "prototype": "js/controllers/code-editor-controller[CodeEditorController]"
+                "prototype": "js/controllers/code-editor-controller"
             },
 
             "owner": {
@@ -352,12 +350,12 @@
                     "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
-                    "codeEditorController":   {"@": "codeEditorController"},
+                    "codeEditorController": {"@": "codeEditorController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
-                    "panelSplitter":     {"@": "splitter3"},
+                    "panelSplitter":        {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"},
-                    "toolsSplitter":     {"@": "splitter2"},
-                    "optionsSplitter":     {"@": "splitter1"}
+                    "toolsSplitter":        {"@": "splitter2"},
+                    "optionsSplitter":      {"@": "splitter1"}
                 }
             }
         }
-- 
cgit v1.2.3


From 2f21eb37a4e7afb4ba3273b3ec50964717448b2f Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 17:16:04 -0700
Subject: Removing more id and changing the appropriate CSS for them

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/ninja.reel/ninja.html | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 34dc8135..b18c79b9 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -364,10 +364,10 @@
 </head>
 <body>
 
-    <div id="main" class="main">
+    <div data-montage-id="main" class="main">
 
         <section id="topMenu">
-            <nav id="mainMenuBar"></nav>
+            <nav data-montage-id="mainMenuBar"></nav>
         </section>
 
         <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section>
@@ -377,22 +377,20 @@
         <section id="appContainer">
             <section data-montage-id="topSplitter" class="topSplitter splitter"></section>
 
-            <section id="topPanelContainer" class="panelContainer">
+            <section data-montage-id="topPanelContainer" id="topPanelContainer" class="panelContainer">
                 <div id="topPanel" class="panel">
                     <div id="toolPropertiesPanel">
-                        <div id="toolsProperties"></div>
+                        <div data-montage-id="toolsProperties"></div>
                     </div>
 
-                    <div id="stageMode" class="unselectable marginposition">
-                        <!--<div id="stageModeImg" class="unselectable editMode"></div>-->
-                    </div>
+                    <div data-montage-id="stageMode" class="unselectable marginposition"></div>
                 </div>
             </section>
 
             <section id="appWorkspace">
-                <section id="leftPanelContainer" class="panelContainer">
+                <section data-montage-id="leftPanelContainer" id="leftPanelContainer" class="panelContainer">
                     <section id="toolsPanelContent" class="panel">
-                        <div id="toolsList"></div>
+                        <div data-montage-id="toolsList"></div>
                     </section>
                 </section>
 
@@ -400,33 +398,33 @@
                     <section class="mainContainerContent">
 
                         <section id="documentTabs">
-                            <div id="openDocumentsTabComponent"></div>
+                            <div data-montage-id="openDocumentsTabComponent" class="openDocumentsTab"></div>
                         </section>
 
-                        <section id="rulerTop"></section>
+                        <section data-montage-id="rulerTop" class="rulerTop"></section>
 
                         <section id="mainContent">
-                            <section id="rulerLeft"></section>
-                            <section id="stageAndScenesContainer"></section>
-                            <section id="pasteboardResizer" class="pasteboardResizer resizeBar"></section>
+                            <section data-montage-id="rulerLeft" class="rulerLeft"></section>
+                            <section data-montage-id="stageAndScenesContainer"></section>
+                            <section data-montage-id="pasteboardResizer" class="pasteboardResizer resizeBar"></section>
                         </section>
-                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
+                        <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
                         <section id="stateBar">
                             <section id="documentBarContainer">
-                                <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>
+                                <div data-montage-id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div>
+                                <div data-montage-id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div>
                             </section>
                         </section>
 
-                        <section id="breadCrumbComponent"></section>
-                        <div id="timelinePanelComponent" data-montage-id="timelinePanel" class="timelinePanel"></div>
+                        <section data-montage-id="breadCrumbComponent"></section>
+                        <div data-montage-id="timelinePanelComponent" class="timelinePanel"></div>
                     </section>
                 </section>
 
                 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
-                <section id="rightPanelContainer" data-montage-id="rightPanelContainer" class="rightPanelContainer panelContainer">
-                    <section id="rightPanelContent" class="rightPanelContent">
+                <section data-montage-id="rightPanelContainer" id="rightPanelContainer" class="rightPanelContainer panelContainer">
+                    <section data-montage-id="rightPanelContent" class="rightPanelContent">
                     </section>
                 </section>
             </section>
@@ -436,7 +434,7 @@
 
         <div data-montage-id="focus-container" class="hidden"></div>
 
-        <section id="popupWindows"></section>
+        <section data-montage-id="popupWindows"></section>
 
     </div>
 
-- 
cgit v1.2.3


From dc93269cfa7c315d22d85c8217e2412749643f28 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 22:51:10 -0700
Subject: Removing unused components references

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/ninja.reel/ninja.html | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index b18c79b9..52a6daa2 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -332,7 +332,6 @@
                     "toolsList":            {"@": "toolsList1"},
                     "toolsProperties":      {"@": "toolsProperties1"},
                     "stage":                {"@": "stage1"},
-                    "settings":             {"@": "settings1"},
                     "elementMediator":      {"@": "elementMediator"},
                     "dragDropMediator":     {"@": "dragDropMediator"},
                     "undocontroller":       {"@": "undocontroller1"},
-- 
cgit v1.2.3