diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/components/ui/file-input.reel | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 | ||