aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-01 21:49:44 -0800
committerNivesh Rajbhandari2012-03-01 21:49:44 -0800
commit50058746779f714ed9b0287f49e56c9f0d35593e (patch)
tree8bfcb041824bfb492765ff814bf8576847a11436 /js/panels/Color
parent500426dea0ca95a6b45be8ea8d132cfdb4d2c940 (diff)
parentff0a956f33df034e9a009cfcb8999e469456a4b5 (diff)
downloadninja-50058746779f714ed9b0287f49e56c9f0d35593e.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Color')
-rwxr-xr-xjs/panels/Color/colorpanel.js11
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/colorpanelbase.js13
2 files changed, 15 insertions, 9 deletions
diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js
index 4858be68..3a603e98 100755
--- a/js/panels/Color/colorpanel.js
+++ b/js/panels/Color/colorpanel.js
@@ -38,7 +38,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
38 //////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////
39 //////////////////////////////////////////////////////////// 39 ////////////////////////////////////////////////////////////
40 //TODO: Remove and add via toolbar draw loop 40 //TODO: Remove and add via toolbar draw loop
41 this.application.ninja.colorController.createToolbar(); 41
42 //////////////////////////////////////////////////////////// 42 ////////////////////////////////////////////////////////////
43 //////////////////////////////////////////////////////////// 43 ////////////////////////////////////////////////////////////
44 44
@@ -47,14 +47,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
47 }, 47 },
48 //////////////////////////////////////////////////////////////////// 48 ////////////////////////////////////////////////////////////////////
49 //Applying default colors only on first draw 49 //Applying default colors only on first draw
50 handleFirstDraw: { 50
51 enumerable: true,
52 value: function (e) {
53 //
54 this.content.applyDefaultColors();
55 this.content.removeEventListener('firstDraw', this, false);
56 }
57 }
58 //////////////////////////////////////////////////////////////////// 51 ////////////////////////////////////////////////////////////////////
59 //////////////////////////////////////////////////////////////////// 52 ////////////////////////////////////////////////////////////////////
60}); \ No newline at end of file 53}); \ No newline at end of file
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index ff738bbe..af62dd07 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -117,10 +117,23 @@ exports.ColorPanelBase = Montage.create(Component, {
117 enumerable: false, 117 enumerable: false,
118 value: function() { 118 value: function() {
119 //TODO: Remove temporary hack, color history should be initilized 119 //TODO: Remove temporary hack, color history should be initilized
120 this.addEventListener('firstDraw', this, false);
121 this.application.ninja.colorController.colorView = this;
120 this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}]; 122 this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}];
121 this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}]; 123 this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}];
122 } 124 }
123 }, 125 },
126
127 handleFirstDraw: {
128 enumerable: true,
129 value: function (e) {
130 //
131 this.application.ninja.colorController.createToolbar();
132 this.applyDefaultColors();
133 this.removeEventListener('firstDraw', this, false);
134 }
135 },
136
124 //////////////////////////////////////////////////////////////////// 137 ////////////////////////////////////////////////////////////////////
125 //Assigning values and binding 138 //Assigning values and binding
126 willDraw: { 139 willDraw: {