Merge branch 'refs/heads/NinjaInternal' into FileIO

1 files changed, 58 insertions, 84 deletions

diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 3cedee6d..0088447a 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -97,10 +97,24 @@ exports.Content = Montage.create(Component, {
         value: function(event) {
 //            console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update
             if(event.detail.source && event.detail.source !== "pi") {
-                this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(this.application.ninja.selectedElements[0]._element, "left"));
-                this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(this.application.ninja.selectedElements[0]._element, "top"));
+                // TODO - This should only update the properties that were changed.
+                var el = this.application.ninja.selectedElements[0]._element || this.application.ninja.selectedElements[0];
+                this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left"));
+                this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top"));
+                this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height"));
+                this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width"));
+
+                if(this.threeD.inGlobalMode)
+                {
+                    this.threeD.x3D = ElementsMediator.get3DProperty(el, "x3D");
+                    this.threeD.y3D = ElementsMediator.get3DProperty(el, "y3D");
+                    this.threeD.z3D = ElementsMediator.get3DProperty(el, "z3D");
+                    this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle");
+                    this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle");
+                    this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle");
             }
         }
+        }
     },
 
     handleSelectionChange: {
@@ -141,7 +155,8 @@ exports.Content = Montage.create(Component, {
 
     displayElementProperties: {
         value: function (el) {
-            var customPI;
+            var customPI,
+                currentValue;
 
             this.elementName = el.elementModel.selection;
             this.elementId.value = el.getAttribute("id") || "";
@@ -180,90 +195,52 @@ exports.Content = Montage.create(Component, {
                 for(var j = 0, fields; fields = customSec.Section[j]; j++) {
                     for(var k = 0, control; control = fields[k]; k++) {
 
-                        if(control.prop !== "border-color" && control.prop !== "background-color") {
-                            var currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator);
+                        if(control.type !== "color") {
+                            currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator);
                             if(currentValue === null)
                             {
                                 currentValue = control.defaultValue;
                             }
                             this.customSections[i].content.controls[control.id] = currentValue;
                         }
+                        else
+                        {
+                            currentValue = ElementsMediator.getColor2(el, control.prop, control.valueMutator);
+                            if(control.prop === "border")
+                            {
+                                this.application.ninja.colorController.colorModel.input = "stroke";
+                            }
+                            else if(control.prop === "background")
+                            {
+                                this.application.ninja.colorController.colorModel.input = "fill";
+                            }
+
+                            if(currentValue)
+                            {
+                                if(currentValue.mode === "gradient")
+                                {
+                                    this.application.ninja.colorController.colorModel["gradient"] =
+                                                    {value: currentValue.color, wasSetByCode: true, type: 'change'};
+                                }
+                                else
+                                {
+                                    if (currentValue.color.a !== undefined)
+                                    {
+                                        this.application.ninja.colorController.colorModel.alpha =
+                                                        {value: currentValue.color.a, wasSetByCode: true, type: 'change'};
+                                    }
+                                    this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
+                                }
+                            }
+                            else
+                            {
+                                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
+                                this.application.ninja.colorController.colorModel.applyNoColor();
+                            }
+                        }
                     }
                 }
             }
-
-            
-            //TODO: Once logic for color and gradient is established, this needs to be revised
-
-            var color, background, backgroundImage, borderColor = ElementsMediator.getProperty(el, "border-color"), borderImage = ElementsMediator.getProperty(el, "border-image");
-            this.application.ninja.colorController.colorModel.input = "stroke";
-            if(borderColor || borderImage) {
-                if (borderImage && borderImage !== 'none' && borderImage.indexOf('-webkit') >= 0) {
-                        //Gradient
-                        color = this.application.ninja.colorController.getColorObjFromCss(borderImage);
-                        if (color && color.value) {
-                                this.application.ninja.colorController.colorModel[color.mode] = {value: color.value, wasSetByCode: true, type: 'change'};
-                        } else {
-                                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                                this.application.ninja.colorController.colorModel.applyNoColor();
-                        }
-                } else {
-                        //Solid
-                        color = this.application.ninja.colorController.getColorObjFromCss(borderColor);
-                        if (color && color.value) {
-                                color.value.wasSetByCode = true;
-                                                color.value.type = 'change';
-                                if (color.value.a) {
-                                        this.application.ninja.colorController.colorModel.alpha = {value: color.value.a, wasSetByCode: true, type: 'change'};
-                                }
-                                this.application.ninja.colorController.colorModel[color.mode] = color.value;
-                        } else {
-                                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                                this.application.ninja.colorController.colorModel.applyNoColor();
-                        }
-                }
-            } else {
-                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                this.application.ninja.colorController.colorModel.applyNoColor();
-            }
-                        //
-            background = ElementsMediator.getProperty(el, "background-color");
-            backgroundImage = ElementsMediator.getProperty(el, "background-image");
-            this.application.ninja.colorController.colorModel.input = "fill";
-            if(background || backgroundImage) {
-                if (backgroundImage && backgroundImage !== 'none' && backgroundImage.indexOf('-webkit') >= 0) {
-                        //Gradient
-                        color = this.application.ninja.colorController.getColorObjFromCss(backgroundImage);
-                        if (color && color.value) {
-                                this.application.ninja.colorController.colorModel[color.mode] = {value: color.value, wasSetByCode: true, type: 'change'};
-                        } else {
-                                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                                this.application.ninja.colorController.colorModel.applyNoColor();
-                        }
-                } else {
-                        //Solid
-                        color = this.application.ninja.colorController.getColorObjFromCss(background);
-                        if (color && color.value) {
-                                color.value.wasSetByCode = true;
-                                                color.value.type = 'change';
-                                if (color.value.a) {
-                                        this.application.ninja.colorController.colorModel.alpha = {value: color.value.a, wasSetByCode: true, type: 'change'};
-                                }
-                                this.application.ninja.colorController.colorModel[color.mode] = color.value;
-                        } else {
-                                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                                this.application.ninja.colorController.colorModel.applyNoColor();
-                        }
-                }
-            } else {
-                this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
-                this.application.ninja.colorController.colorModel.applyNoColor();
-            }
-
-
-
-
-
         }
     },
 
@@ -303,16 +280,12 @@ exports.Content = Montage.create(Component, {
 
     handlePropertyChange: {
         value: function(e) {
+            if(e.wasSetByCode) return;
+
             var newValue;
 
             e.units ? newValue = e.value + e.units : newValue = e.value;
 
-            if(e.prop === "border-width") {// || e.prop === "border-style") {
-                ElementsMediator.setProperty(this.application.ninja.selectedElements, "border-style", [this.customSections[0].content.controls.borderStyle], "Change", "pi");
-            } else if(e.prop === "border-style") {
-                ElementsMediator.setProperty(this.application.ninja.selectedElements, "border-width", [this.customSections[0].content.controls.borderWidth + "px"], "Change", "pi");
-            }
-
             ElementsMediator.setProperty(this.application.ninja.selectedElements, e.prop, [newValue], "Change", "pi");