diff options
| author | Jose Antonio Marquez | 2012-06-28 18:18:11 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-28 18:18:11 -0700 |
| commit | 2f1ad000aeda418696d6ed74202db5e6565ab671 (patch) | |
| tree | 92aa8ba48645a621c6f335bfc101335ce69b496c /js/panels/properties.reel/sections/custom.reel/custom.js | |
| parent | a859432f0cc5746e2855c16565a75391ea657772 (diff) | |
| parent | 8cf2345f5ce1f03ec06a1f34e0ef2dba0d5055bd (diff) | |
| download | ninja-2f1ad000aeda418696d6ed74202db5e6565ab671.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel/custom.js')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 5112fca9..ed4616da 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
| @@ -20,7 +20,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox; | |||
| 20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
| 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; | 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
| 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
| 23 | var Button = require("montage/ui/button.reel").Button; | 23 | var Button = require("montage/ui/native/button.reel").Button; |
| 24 | 24 | ||
| 25 | exports.CustomSection = Montage.create(Component, { | 25 | exports.CustomSection = Montage.create(Component, { |
| 26 | 26 | ||