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.html | |
| 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.html')
| -rwxr-xr-x | js/components/ui/file-input.reel/file-input.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html index 5cdd8f9e..2a8546a5 100755 --- a/js/components/ui/file-input.reel/file-input.html +++ b/js/components/ui/file-input.reel/file-input.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "js/components/ui/file-input", | 14 | "module": "js/components/ui/file-input.reel", |
| 15 | "name": "FileInput", | 15 | "name": "FileInput", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "fileInput"}, | 17 | "element": {"#": "fileInput"}, |
| @@ -23,8 +23,8 @@ | |||
| 23 | </script> | 23 | </script> |
| 24 | </head> | 24 | </head> |
| 25 | <body> | 25 | <body> |
| 26 | <div id="fileInput"> | 26 | <div id="fileInput" class="fileInput"> |
| 27 | <input id="fileInputTextField" class="file-path" type="text" /> | 27 | <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> |
| 28 | <input id="fileInputControl" class="browse-button" type="file" /> | 28 | <input id="fileInputControl" class="browse-button" type="file" /> |
| 29 | </div> | 29 | </div> |
| 30 | </body> | 30 | </body> |