diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/io/ui/file-picker/file-input-field.reel/file-input-field.html')
| -rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.html | 11 |
1 files changed, 5 insertions, 6 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 00df1c11..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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -19,8 +19,7 @@ | |||
| 19 | }, | 19 | }, |
| 20 | 20 | ||
| 21 | "owner":{ | 21 | "owner":{ |
| 22 | "module": "js/io/ui/file-picker/file-input-field.reel", | 22 | "prototype": "js/io/ui/file-picker/file-input-field.reel", |
| 23 | "name": "FileInputField", | ||
| 24 | "properties": { | 23 | "properties": { |
| 25 | "element": {"#": "fileInputField"}, | 24 | "element": {"#": "fileInputField"}, |
| 26 | "findDirectory": {"#": "findDirectory"}, | 25 | "findDirectory": {"#": "findDirectory"}, |
| @@ -31,9 +30,9 @@ | |||
| 31 | </script> | 30 | </script> |
| 32 | </head> | 31 | </head> |
| 33 | <body> | 32 | <body> |
| 34 | <div id="fileInputField" class="fileInputField"> | 33 | <div data-montage-id="fileInputField" class="fileInputField"> |
| 35 | <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" /> | 34 | <input type="search" data-montage-id="newFileDirectory" class="nj-skinned newFileDirectory" /> |
| 36 | <span id="findDirectory" class="findDirectory"></span> | 35 | <span data-montage-id="findDirectory" class="findDirectory"></span> |
| 37 | </div> | 36 | </div> |
| 38 | </body> | 37 | </body> |
| 39 | </html> \ No newline at end of file | 38 | </html> \ No newline at end of file |