From da03585a0b03220281f6d54d9acf0ae0fafaef16 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Thu, 22 Mar 2012 11:53:21 -0700
Subject: Presets Panel - Adding presets controller to serialization

---
 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 f9e1efdd..a4779ee3 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -267,6 +267,11 @@
                 "name": "StylesController"
             },
 
+            "presetsController": {
+                "module": "js/controllers/presets-controller",
+                "name": "PresetsController"
+            },
+
             "filePickerController": {
                 "module": "js/io/ui/file-picker/file-picker-controller",
                 "name": "FilePickerController"
@@ -315,6 +320,7 @@
                     "popupManager":         {"@": "popupManager1"},
 					"colorController":      {"@": "colorController1"},
                     "stylesController":     {"@": "stylesController"},
+                    "presetsController":     {"@": "presetsController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":    		{"@": "coreIoApi1"},
-- 
cgit v1.2.3


From 49596f2a6b518ed0ee945006787d3c69e40a5757 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 22 Mar 2012 14:31:12 -0700
Subject: Updated Resizers for Panels and timeline

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/ninja.reel/ninja.html | 97 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 70 insertions(+), 27 deletions(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index f9e1efdd..b3545329 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -77,34 +77,79 @@
                 "name": "Splitter",
                 "properties": {
                     "element": {"#": "bottomSplitter"},
-                    "panel": {"#": "bottomPanelContainer"},
-                    "resizeBar": {"#": "timelineResizer"}
+                    "panel": {"@": "timeline"}
                 }
             },
 
             "resizer1": {
-                "module": "js/panels/Resizer",
-                "name": "Resizer",
+                "module": "js/panels/resize-composer",
+                "name": "ResizeComposer",
                 "properties": {
                     "element": {"#": "rightPanelResizer"},
-                    "id": "rightPanelResizer",
-                    "panel": {"#": "rightPanelContainer"},
-                    "isVertical": false,
-                    "redrawStage": true
-                }
+                    "component": {"@": "owner"},
+                    "yAxis": false
+                },
+                "listeners": [
+                    {
+                        "type": "resizeStart",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeMove",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeEnd",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "resizer2": {
-                "module": "js/panels/Resizer",
-                "name": "Resizer",
+                "module": "js/panels/resize-composer",
+                "name": "ResizeComposer",
                 "properties": {
                     "element": {"#": "timelineResizer"},
-                    "id": "timelineResizer",
-                    "panel": {"#": "bottomPanelContainer"},
-                    "isVertical": true,
-                    "isInversed": true,
-                    "redrawStage": true
-                }
+                    "component": {"@": "owner"},
+                    "xAxis": false
+                },
+                "listeners": [
+                    {
+                        "type": "resizeStart",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeMove",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeEnd",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            },
+
+            "Resizer": {
+                "module": "js/panels/resize-composer",
+                "name": "ResizeComposer",
+                "properties": {
+                    "element": {"#": "pasteboardResizer"},
+                    "component": {"@": "owner"}
+                },
+                "listeners": [
+                    {
+                        "type": "resizeStart",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeMove",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeEnd",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "stageMode": {
@@ -321,7 +366,10 @@
                     "documentBar":          {"@": "documentBar"},
                     "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
-                    "mainMenuController":   {"@": "mainMenuController"}
+                    "mainMenuController":   {"@": "mainMenuController"},
+                    "rightPanelContainer":  {"#": "rightPanelContainer" },
+                    "panelSplitter":     {"@": "splitter3"},
+                    "timelineSplitter":     {"@": "splitter4"}
                 }
             }
         }
@@ -374,7 +422,9 @@
                         <section id="mainContent">
                             <section id="rulerLeft"></section>
                             <section id="stageAndScenesContainer"></section>
+                            <section id="pasteboardResizer" class="pasteboardResizer resizeBar"></section>
                         </section>
+                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
                         <section id="stateBar">
                             <section id="documentBarContainer">
                                 <div id="documentBar" class="documentBar"><a href="#">HTML</a></div>
@@ -382,20 +432,13 @@
                         </section>
 
                         <section id="breadCrumbComponent"></section>
-
-                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
-
-                        <section id="bottomPanelContainer" class="panelContainer">
-                            <section id="timelinePanel" class="panel">
-                                <div id="timelinePanelComponent"></div>
-                            </section>
-                        </section>
+                        <div id="timelinePanelComponent" data-montage-id="timelinePanel" class="timelinePanel"></div>
                     </section>
                 </section>
 
                 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
-                <section id="rightPanelContainer" class="rightPanelContainer panelContainer">
+                <section id="rightPanelContainer" data-montage-id="rightPanelContainer" class="rightPanelContainer panelContainer">
                     <section id="rightPanelContent" class="rightPanelContent">
                     </section>
                 </section>
-- 
cgit v1.2.3


From 94a4be4b7b77f4c1498e8fb65e00d73ccbd56813 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Fri, 23 Mar 2012 14:33:41 -0700
Subject: Resizers updated

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/ninja.reel/ninja.html | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index b3545329..7b5a6e52 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -148,6 +148,10 @@
                     {
                         "type": "resizeEnd",
                         "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeReset",
+                        "listener": {"@": "owner"}
                     }
                 ]
             },
-- 
cgit v1.2.3