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/Materials/materials-popup.reel/materials-popup.js | |
| 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/Materials/materials-popup.reel/materials-popup.js')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index c57bb2d7..193e72b7 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
| @@ -5,9 +5,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
| 8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component, |
| 9 | var Button = require("js/components/button.reel").Button; | 9 | MaterialsModel = require("js/models/materials-model").MaterialsModel; |
| 10 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
| 11 | 10 | ||
| 12 | //////////////////////////////////////////////////////////////////////// | 11 | //////////////////////////////////////////////////////////////////////// |
| 13 | //Exporting as MaterialsPopup | 12 | //Exporting as MaterialsPopup |