19 files changed, 1175 insertions, 909 deletions

diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..3eae3ea3 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -379,11 +379,16 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 gradient.element = container;
                 gradient.hack = this.hack; // TODO: Remove
                 //
-                if (g && g.value && g.value.stops && g.value.mode) {
-                        gradient._mode = g.value.mode;
-                        gradient.value = g.value.stops;
+                if (g && g.value && g.value.stops) {
+                        if (g.value.gradientMode) {
+                                gradient._mode = g.value.gradientMode;
+                                gradient.value = g.value.stops;
+                        } else {
+                                gradient._mode = 'linear';
+                                gradient.value = g.value.stops;
+                        }
                 } else {
-                        gradient._mode = this.defaultGradient.mode;
+                        gradient._mode = this.defaultGradient.gradientMode;
                         gradient.value = this.defaultGradient.stops;
                 }
                 //
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 04e2930a..43b87940 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -113,6 +113,21 @@
                 }
             },
 
+            "disabledCondition": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
+
             "owner": {
                 "module": "js/panels/Panel.reel",
                 "name": "Panel",
@@ -136,9 +151,8 @@
     </div>
     <div class="panelBody">
         <div class="panelBodyContent">
-            <div id="panelObject" class="panelObjects">
-
-            </div>
+            <div id="disabledCondition" class="panelDisabled"></div>
+            <div id="panelObject" class="panelObjects"></div>
         </div>
     </div>
     <div id="resizeBar" class="resizeBar"></div>
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index e0bf3f18..33f9b3a7 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -9,31 +9,56 @@ var Component = require("montage/ui/component").Component;
 
 exports.Panel = Montage.create(Component, {
 
-    name: { value: "Panel" },
-    collapsedHeight: {value: 26},
-    _collapsed: {value: false},
-    _height: { value: 200 },
-    minHeight: {value: 200 },
-    maxHeight: { value: null},
-    flexible: {value: true},
-    _locked: { value: false},
-    isResizing: {value: false },
-    resizer: {value: null },
-    modulePath: {value: null},
-    moduleName: {value: null},
-    _contentComponent: {value: null},
-
-    contentComponent: {
-        get: function() {
-            return this._contentComponent;
-        },
-        set: function(val) {
-            if (val !== null && val !== this._contentComponent) {
-                this.panelContent.content = val;
-                this.panelContent.needsDraw = true;
-                this._contentComponent = val;
-            }
-        }
+    name: {
+        value: "Panel"
+    },
+
+    _collapsed: {
+        value: false
+    },
+
+    _height: {
+        value: 200
+    },
+
+    minHeight: {
+        value: 200
+    },
+
+    maxHeight: {
+        value: null
+    },
+
+    flexible: {
+        value: true
+    },
+
+    _locked: {
+        value: false
+    },
+
+    isResizing: {
+        value: false
+    },
+
+    _resizedHeight: {
+        value: 0
+    },
+
+    resizer: {
+        value: null
+    },
+
+    modulePath: {
+        value: null
+    },
+
+    moduleName: {
+        value: null
+    },
+
+    disabled: {
+        value:false
     },
 
     collapsed: {
@@ -63,10 +88,6 @@ exports.Panel = Montage.create(Component, {
         }
     },
 
-    _resizedHeight: {
-        value: 0
-    },
-
     locked: {
         get: function() {
             return this._locked;
@@ -94,17 +115,20 @@ exports.Panel = Montage.create(Component, {