diff options
| author | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
| commit | 3675cac3993430490d9eef18157314d53ffa1a6a (patch) | |
| tree | fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/components/ui/file-input.reel/file-input.js | |
| parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
| parent | 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff) | |
| download | ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz | |
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/components/ui/file-input.reel/file-input.js')
| -rwxr-xr-x | js/components/ui/file-input.reel/file-input.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js index 2ea38162..b57f7c21 100755 --- a/js/components/ui/file-input.reel/file-input.js +++ b/js/components/ui/file-input.reel/file-input.js | |||
| @@ -5,7 +5,7 @@ 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 | 9 | ||
| 10 | var FileInput = exports.FileInput = Montage.create(Component, { | 10 | var FileInput = exports.FileInput = Montage.create(Component, { |
| 11 | 11 | ||