diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/io/ui/file-picker/file-input-field.reel | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 |