aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-15 13:46:53 -0700
committerJonathan Duran2012-03-15 13:46:53 -0700
commitcc57a3dff8f504526bbf41a8b01c412c4788424a (patch)
tree9127331e952ef1da6faa331ec0bb49ea3acfb980 /js/panels/properties.reel/properties.js
parent0893ba7f5d1f03099c7b5f8c53ce750e412023cd (diff)
parente6bfd7fb3d3324bea5dbc05350832a9e25c6c00d (diff)
downloadninja-cc57a3dff8f504526bbf41a8b01c412c4788424a.tar.gz
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>
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-xjs/panels/properties.reel/properties.js29
1 files changed, 28 insertions, 1 deletions
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, {
283 this.customPi = el.elementModel.pi; 283 this.customPi = el.elementModel.pi;
284 this.displayCustomProperties(el, el.elementModel.pi); 284 this.displayCustomProperties(el, el.elementModel.pi);
285 } 285 }
286 286 var previousInput = this.application.ninja.colorController.colorModel.input;
287 customPI = PiData[this.customPi]; 287 customPI = PiData[this.customPi];
288 // Get all the custom section for the custom PI 288 // Get all the custom section for the custom PI
289 for(var i = 0, customSec; customSec = customPI[i]; i++) { 289 for(var i = 0, customSec; customSec = customPI[i]; i++) {
@@ -352,6 +352,33 @@ exports.Properties = Montage.create(Component, {
352 } 352 }
353 } 353 }
354 } 354 }
355 this.application.ninja.colorController.colorModel.input = previousInput;
356 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
357 color.c.wasSetByCode = true;
358 color.c.type = 'change';
359 switch (color.m) {
360 case 'rgb':
361 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
362 this.application.ninja.colorController.colorModel.rgb = color.c;
363 break;
364 case 'hsl':
365 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
366 this.application.ninja.colorController.colorModel.hsl = color.c;
367 break;
368 case 'hex':
369 //TODO: Check if anything needed here
370 break;
371 case 'gradient':
372 this.application.ninja.colorController.colorModel.gradient = color.c;
373 break;
374 case 'hsv':
375 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
376 this.application.ninja.colorController.colorModel.hsv = color.c;
377 break;
378 default:
379 this.application.ninja.colorController.colorModel.applyNoColor();
380 break;
381 }
355 } 382 }
356 } 383 }
357 }, 384 },