aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-02 13:19:20 -0700
committerArmen Kesablyan2012-07-02 13:19:20 -0700
commit526b9d76686323f488f1b26175440172b715d808 (patch)
tree47fc6bd90715b403a08d08a48a86f4d24da1ba29 /js/components/gradientpicker.reel
parentb194664df7e01aaeb8d1e7220a6de0e7f879f1db (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-526b9d76686323f488f1b26175440172b715d808.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/gradientpicker.reel')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 6071f3c6..f912eb51 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -43,7 +43,7 @@ exports.GradientPicker = Montage.create(Component, {
43 get: function() {return this._mode;}, 43 get: function() {return this._mode;},
44 set: function(value) { 44 set: function(value) {
45 // 45 //
46 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 46 this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
47 // 47 //
48 this._mode = value; 48 this._mode = value;
49 // 49 //
@@ -132,7 +132,7 @@ exports.GradientPicker = Montage.create(Component, {
132 value: function(data, silent) { 132 value: function(data, silent) {
133 if (this.application.ninja.colorController.colorPopupManager) { 133 if (this.application.ninja.colorController.colorPopupManager) {
134 //Hiding any open popups (of gradient buttons) 134 //Hiding any open popups (of gradient buttons)
135 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 135 this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
136 //Creating stop elements 136 //Creating stop elements
137 var stop = document.createElement('div'), 137 var stop = document.createElement('div'),
138 holder = document.createElement('div'), 138 holder = document.createElement('div'),
@@ -147,6 +147,7 @@ exports.GradientPicker = Montage.create(Component, {
147 stop.addEventListener('mouseup', this, false); 147 stop.addEventListener('mouseup', this, false);
148 //Storing refereces to buttons and actual stop container 148 //Storing refereces to buttons and actual stop container
149 button.stop = stop; 149 button.stop = stop;
150 tooltip.stop = stop;
150 stop.button = button; 151 stop.button = button;
151 //Adding stop to container 152 //Adding stop to container
152 this.trackChips.appendChild(stop); 153 this.trackChips.appendChild(stop);
@@ -160,7 +161,7 @@ exports.GradientPicker = Montage.create(Component, {
160 //Initialing button with color data 161 //Initialing button with color data
161 button.color(data.color.mode, data.color.value); 162 button.color(data.color.mode, data.color.value);
162 //Button popup data 163 //Button popup data
163 button.props = {side: 'top', align: 'center', nocolor: false, wheel: true, palette: true, gradient: false, image: false, offset: -84, panel: true}; 164 button.props = {side: 'top', align: 'center', nocolor: false, wheel: true, palette: false, gradient: false, image: false, offset: -84, gradientPopup: true, history: false};
164 //Listening for color events from button 165 //Listening for color events from button
165 button.addEventListener('change', this, false); 166 button.addEventListener('change', this, false);
166 //Dispatching event depending on type of mode 167 //Dispatching event depending on type of mode
@@ -263,7 +264,7 @@ exports.GradientPicker = Montage.create(Component, {
263 // 264 //
264 this._updating = true; 265 this._updating = true;
265 // 266 //
266 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 267 this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
267 // 268 //
268 if (e._event.y > this._trackData.y+70 || e._event.y < this._trackData.y) { 269 if (e._event.y > this._trackData.y+70 || e._event.y < this._trackData.y) {
269 this.removeStop(this.currentStop); 270 this.removeStop(this.currentStop);