diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/ui/file-input.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/ui/file-input.reel')
| -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 0c3c465e..735f970c 100755 --- a/js/components/ui/file-input.reel/file-input.html +++ b/js/components/ui/file-input.reel/file-input.html | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | </script> | 22 | </script> |
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <div id="fileInput" class="fileInput"> | 25 | <div data-montage-id="fileInput" class="fileInput"> |
| 26 | <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> | 26 | <input data-montage-id="fileInputTextField" class="file-path nj-skinned" type="text" /> |
| 27 | <input id="fileInputControl" class="browse-button" type="file" /> | 27 | <input data-montage-id="fileInputControl" class="browse-button" type="file" /> |
| 28 | </div> | 28 | </div> |
| 29 | </body> | 29 | </body> |
| 30 | </html> \ No newline at end of file | 30 | </html> \ No newline at end of file |