Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

2 files changed, 217 insertions, 29 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index f9e1efdd..ead7f576 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -77,34 +77,83 @@
                 "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"}
+                    },
+                    {
+                        "type": "resizeReset",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "stageMode": {
@@ -267,6 +316,11 @@
                 "name": "StylesController"
             },
 
+            "presetsController": {
+                "module": "js/controllers/presets-controller",
+                "name": "PresetsController"
+            },
+
             "filePickerController": {
                 "module": "js/io/ui/file-picker/file-picker-controller",
                 "name": "FilePickerController"
@@ -315,13 +369,17 @@
                     "popupManager":         {"@": "popupManager1"},
                                         "colorController":      {"@": "colorController1"},
                     "stylesController":     {"@": "stylesController"},
+                    "presetsController":     {"@": "presetsController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":                {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
                     "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
-                    "mainMenuController":   {"@": "mainMenuController"}
+                    "mainMenuController":   {"@": "mainMenuController"},
+                    "rightPanelContainer":  {"#": "rightPanelContainer" },
+                    "panelSplitter":     {"@": "splitter3"},
+                    "timelineSplitter":     {"@": "splitter4"}
                 }
             }
         }
@@ -374,7 +432,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 +442,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>
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index c76c7d46..9b5081dd 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -6,6 +6,7 @@
 
 var Montage = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component,
+    UndoManager = require("montage/core/undo-manager").UndoManager,
     AppData     = require("js/data/appdata").AppData;
 
 var matrix = require("js/lib/math/matrix");
@@ -23,6 +24,113 @@ exports.Ninja = Montage.create(Component, {
         value: null
     },
 
+    _isResizing: {
+        value: null
+    },
+    _resizedHeight : {
+        value: 0
+    },
+    _height: {
+        value: null
+    },
+
+    height: {
+        get: function() {
+            if(this._height === null) {
+                var storedData = this.application.localStorage.getItem("timelinePanel");
+                if(storedData && storedData.value) {
+                    this._height = storedData.value;
+                }
+            }
+            return this._height;
+        },
+        set: function(val) {
+            if(this._height != val) {
+                this._height = val;
+                this.application.localStorage.setItem("timelinePanel", {"version": this.version, "value": val});
+                this.needsDraw = true;
+            }
+
+        }