aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-25 11:52:28 -0700
committerJose Antonio Marquez2012-06-25 11:52:28 -0700
commitb435e97ff312eea15086069ce0ab6991acac32ff (patch)
tree542366a4fcd2df043ce91ec7a765ed18511bb70b /js/panels/properties.reel/properties.js
parent32c41a56fd870f28be70c9b9cfb4fe6dfbb16654 (diff)
downloadninja-b435e97ff312eea15086069ce0ab6991acac32ff.tar.gz
Color Popup Test Candidate
Preliminary check in for testing to commence on new color popup functionality.
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-xjs/panels/properties.reel/properties.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 5719a63d..c8383307 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -373,7 +373,7 @@ exports.Properties = Montage.create(Component, {
373 } 373 }
374 } 374 }
375 } 375 }
376 376 if (previousInput === 'chip') return;
377 this.application.ninja.colorController.colorModel.input = previousInput; 377 this.application.ninja.colorController.colorModel.input = previousInput;
378 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1]; 378 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
379 color.c.wasSetByCode = true; 379 color.c.wasSetByCode = true;