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/io/ui/file-picker/file-input-field.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/io/ui/file-picker/file-input-field.reel')
| -rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html index 9113eb80..c3209654 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |||
| @@ -30,9 +30,9 @@ | |||
| 30 | </script> | 30 | </script> |
| 31 | </head> | 31 | </head> |
| 32 | <body> | 32 | <body> |
| 33 | <div id="fileInputField" class="fileInputField"> | 33 | <div data-montage-id="fileInputField" class="fileInputField"> |
| 34 | <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" /> | 34 | <input type="search" data-montage-id="newFileDirectory" class="nj-skinned newFileDirectory" /> |
| 35 | <span id="findDirectory" class="findDirectory"></span> | 35 | <span data-montage-id="findDirectory" class="findDirectory"></span> |
| 36 | </div> | 36 | </div> |
| 37 | </body> | 37 | </body> |
| 38 | </html> \ No newline at end of file | 38 | </html> \ No newline at end of file |