diff options
| author | Valerio Virgillito | 2012-07-16 11:26:29 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-16 11:26:29 -0700 |
| commit | 318b3d99749c8620114eb5abae690901b9197bd2 (patch) | |
| tree | 6d9483187d62d105c4806a83cb0c857b94cdec5a /js | |
| parent | c250404e7e1b8015ccc4967a102e2d3873f2d83a (diff) | |
| parent | 0ede302f0568cf25498cfa0f2aa9ce3686e84add (diff) | |
| download | ninja-318b3d99749c8620114eb5abae690901b9197bd2.tar.gz | |
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'js')
| -rwxr-xr-x | js/components/gradientpicker.reel/gradientpicker.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js index d4611468..eecf7014 100755 --- a/js/components/gradientpicker.reel/gradientpicker.js +++ b/js/components/gradientpicker.reel/gradientpicker.js | |||
| @@ -174,6 +174,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
| 174 | button.stop = stop; | 174 | button.stop = stop; |
| 175 | tooltip.stop = stop; | 175 | tooltip.stop = stop; |
| 176 | holder.stop = stop; | 176 | holder.stop = stop; |
| 177 | stop.stop = stop; | ||
| 177 | stop.button = button; | 178 | stop.button = button; |
| 178 | //Adding stop to container | 179 | //Adding stop to container |
| 179 | this.trackChips.appendChild(stop); | 180 | this.trackChips.appendChild(stop); |