diff options
| author | Valerio Virgillito | 2012-03-19 13:53:40 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-19 13:53:40 -0700 |
| commit | 1b39a039291bcbabbcca9f778bc5a9bc990eafbb (patch) | |
| tree | 400a419cfc32f84f52fea46a27eb2f91f001411f /js/panels/color | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| parent | 50ee8428d398d2a5f21f4d642642ba85d7df3e5e (diff) | |
| download | ninja-1b39a039291bcbabbcca9f778bc5a9bc990eafbb.tar.gz | |
Merge pull request #128 from mqg734/WebGLMaterials
Replacing old button component with montage button component in our UI.
Diffstat (limited to 'js/panels/color')
| -rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.js | 1 | ||||
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js index 05bcb447..414be8b7 100755 --- a/js/panels/color/colorchippopup.reel/colorchippopup.js +++ b/js/panels/color/colorchippopup.reel/colorchippopup.js | |||
| @@ -9,7 +9,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 9 | var Montage = require("montage/core/core").Montage, | 9 | var Montage = require("montage/core/core").Montage, |
| 10 | Component = require("montage/ui/component").Component, | 10 | Component = require("montage/ui/component").Component, |
| 11 | Slider = require("js/components/slider.reel").Slider, | 11 | Slider = require("js/components/slider.reel").Slider, |
| 12 | Button = require("js/components/button.reel").Button, | ||
| 13 | HotText = require("js/components/hottext.reel").HotText, | 12 | HotText = require("js/components/hottext.reel").HotText, |
| 14 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, | 13 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, |
| 15 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; | 14 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; |
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js index b957d495..dd7e6192 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | |||
| @@ -9,7 +9,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 9 | var Montage = require("montage/core/core").Montage, | 9 | var Montage = require("montage/core/core").Montage, |
| 10 | Component = require("montage/ui/component").Component, | 10 | Component = require("montage/ui/component").Component, |
| 11 | Slider = require("js/components/slider.reel").Slider, | 11 | Slider = require("js/components/slider.reel").Slider, |
| 12 | Button = require("js/components/button.reel").Button, | ||
| 13 | HotText = require("js/components/hottext.reel").HotText, | 12 | HotText = require("js/components/hottext.reel").HotText, |
| 14 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, | 13 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, |
| 15 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; | 14 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; |