Merge branch 'refs/heads/Ninja-Internal' into Color

44 files changed, 1814 insertions, 1355 deletions

diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js
index 4858be68..3a603e98 100755
--- a/js/panels/Color/colorpanel.js
+++ b/js/panels/Color/colorpanel.js
@@ -38,7 +38,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
             ////////////////////////////////////////////////////////////
             ////////////////////////////////////////////////////////////
             //TODO: Remove and add via toolbar draw loop
-            this.application.ninja.colorController.createToolbar();
+
             ////////////////////////////////////////////////////////////
             ////////////////////////////////////////////////////////////
 
@@ -47,14 +47,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
     },
     ////////////////////////////////////////////////////////////////////
     //Applying default colors only on first draw
-    handleFirstDraw: {
-        enumerable: true,
-        value: function (e) {
-                //
-                this.content.applyDefaultColors();
-                this.content.removeEventListener('firstDraw', this, false);
-        }
-    }
+
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index ff738bbe..af62dd07 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -117,10 +117,23 @@ exports.ColorPanelBase = Montage.create(Component, {
         enumerable: false,
         value: function() {
                 //TODO: Remove temporary hack, color history should be initilized
+            this.addEventListener('firstDraw', this, false);
+            this.application.ninja.colorController.colorView = this;
                 this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}];
                 this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}];
         }
     },
+
+    handleFirstDraw: {
+        enumerable: true,
+        value: function (e) {
+            //
+            this.application.ninja.colorController.createToolbar();
+            this.applyDefaultColors();
+            this.removeEventListener('firstDraw', this, false);
+        }
+    },
+
     ////////////////////////////////////////////////////////////////////
     //Assigning values and binding
     willDraw: {
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index b4eec771..b6bee37d 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -118,7 +118,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
     didCreate: {
         value: function() {
             // Setup the drop delegate
-            this.application.ninja.dragDropMediator.dropDelegate = this;
+//            this.application.ninja.dragDropMediator.dropDelegate = this;
             // Loop through the component and load the JSON data for them
             this._loadComponents();
         }
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 508b8130..c57bb2d7 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component;
 var Button =                    require("js/components/button.reel").Button;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 ////////////////////////////////////////////////////////////////////////
 //Exporting as MaterialsPopup
@@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, {
                                         (materialID ===  "RadialGradientMaterial")
                                 )
                         {
-                                var material = MaterialsLibrary.getMaterial( materialID );
+                                var material = MaterialsModel.getMaterial( materialID );
                                 if (material)
                                 {
                                         this._material = material;
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 7556952c..43b87940 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -8,22 +8,86 @@
 <head>
     <script type="text/montage-serialization">
         {
-            "resizer1": {
-                "module": "js/panels/Resizer",
-                "name": "Resizer",
+            "Resizer": {
+                "module": "js/panels/resize-composer",
+                "name": "ResizeComposer",
                 "properties": {
                     "element": {"#": "resizeBar"},
-                    "panel": {"#": "panel"},
-                    "isVertical": true,
-                    "willSave": false
+                    "component": {"@": "owner"}
                 },
-                "bindings": {
-                    "ownerId": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "panelBase.panelName",
-                        "oneway": true
+                "listeners": [
+                    {
+                        "type": "resizeStart",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeMove",
+                        "listener": {"@": "owner"}
+                    },
+                    {