diff options
| author | mqg734 | 2012-02-21 16:49:11 -0800 |
|---|---|---|
| committer | mqg734 | 2012-02-21 16:49:11 -0800 |
| commit | d2f4d5e5f6742d53b6324d585a700566f73c992a (patch) | |
| tree | 8a3de8de6dc5ac5f6f3f0795d00a7d2d788374d7 /js/components/ui/file-input.reel | |
| parent | abf78e2d7a97d295ce5a1c425fd359d47379137e (diff) | |
| download | ninja-d2f4d5e5f6742d53b6324d585a700566f73c992a.tar.gz | |
Updated Materials Library and Materials Editor Popup to work with latest version of Montage.
We had to change our css to not use id's.
Also, updated the popup to use Montage's Popup component.
It looks like bump material has a bug. So loading that material results in a runtime error.
Diffstat (limited to 'js/components/ui/file-input.reel')
| -rwxr-xr-x | js/components/ui/file-input.reel/file-input.html | 6 | ||||
| -rwxr-xr-x | js/components/ui/file-input.reel/file-input.js | 2 |
2 files changed, 4 insertions, 4 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> |
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 | ||