Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/selection-controller.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/helper-classes/backup-delete/GLBrushStroke.js
	js/helper-classes/backup-delete/GLCircle.js
	js/helper-classes/backup-delete/GLGeomObj.js
	js/helper-classes/backup-delete/GLRectangle.js
	js/helper-classes/backup-delete/GLSubpath.js
	js/helper-classes/backup-delete/GLWorld.js
	js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
	js/helper-classes/backup-delete/Materials/DeformMaterial.js
	js/helper-classes/backup-delete/Materials/FlatMaterial.js
	js/helper-classes/backup-delete/Materials/FlyMaterial.js
	js/helper-classes/backup-delete/Materials/JuliaMaterial.js
	js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
	js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
	js/helper-classes/backup-delete/Materials/MandelMaterial.js
	js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
	js/helper-classes/backup-delete/Materials/PulseMaterial.js
	js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js
	js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
	js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js
	js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
	js/helper-classes/backup-delete/Materials/StarMaterial.js
	js/helper-classes/backup-delete/Materials/TaperMaterial.js
	js/helper-classes/backup-delete/Materials/TunnelMaterial.js
	js/helper-classes/backup-delete/Materials/TwistMaterial.js
	js/helper-classes/backup-delete/Materials/TwistVertMaterial.js
	js/helper-classes/backup-delete/Materials/UberMaterial.js
	js/helper-classes/backup-delete/Materials/WaterMaterial.js
	js/helper-classes/backup-delete/Materials/ZInvertMaterial.js
	js/lib/drawing/world.js
	js/preloader/Preloader.js
	js/stage/layout.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

2 files changed, 36 insertions, 4 deletions

diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 3215e928..a396ea28 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -66,6 +66,7 @@ exports.Splitter = Montage.create(Component, {
             var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id"));
             if(storedData && this.element.getAttribute("data-montage-id") !== null) {
                 this._collapsed = storedData.value;
+
             } else {
                 this._collapsed = false;
             }
@@ -77,13 +78,11 @@ exports.Splitter = Montage.create(Component, {
     draw: {
         value: function() {
             if(this.collapsed) {
-                
                 if(this.panel.element) this.panel.element.classList.add("collapsed");
                 else this.panel.classList.add("collapsed");
                 this.element.classList.add("collapsed");
                 if(this._resizeBar != null) this.resizeBar.classList.add("collapsed");
-            }
-            else {
+            } else {
                 if(this.panel.element) this.panel.element.classList.remove("collapsed");
                 else this.panel.classList.remove("collapsed");
                 this.element.classList.remove("collapsed");
@@ -92,6 +91,12 @@ exports.Splitter = Montage.create(Component, {
         }
     },
 
+    didDraw: {
+        value: function() {
+            this.application.ninja.stage.resizeCanvases = true;
+        }
+    },
+
     handleClick : {
         value: function() {
             if (!this.disabled) {
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 947d7937..580d945d 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -283,7 +283,7 @@ exports.Properties = Montage.create(Component, {
                 this.customPi = el.elementModel.pi;
                 this.displayCustomProperties(el, el.elementModel.pi);
             }
-
+                        var previousInput = this.application.ninja.colorController.colorModel.input;
             customPI = PiData[this.customPi];
             // Get all the custom section for the custom PI
             for(var i = 0, customSec; customSec = customPI[i]; i++) {
@@ -352,6 +352,33 @@ exports.Properties = Montage.create(Component, {
                         }
                     }
                 }
+                this.application.ninja.colorController.colorModel.input =  previousInput;
+                var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
+                        color.c.wasSetByCode = true;
+                        color.c.type = 'change';
+                        switch (color.m) {
+                                case 'rgb':
+                                        this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
+                                        this.application.ninja.colorController.colorModel.rgb = color.c;
+                                        break;
+                                case 'hsl':
+                                        this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
+                                        this.application.ninja.colorController.colorModel.hsl = color.c;
+                                        break;
+                                case 'hex':
+                                        //TODO: Check if anything needed here
+                                        break;
+                                case 'gradient':
+                                        this.application.ninja.colorController.colorModel.gradient = color.c;
+                                        break;
+                                case 'hsv':
+                                        this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
+                                        this.application.ninja.colorController.colorModel.hsv = color.c;
+                                        break;
+                                default:
+                                        this.application.ninja.colorController.colorModel.applyNoColor();
+                                        break;
+                        }
             }
         }
     },