diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
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 | 31 |
1 files changed, 31 insertions, 0 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 new file mode 100755 index 00000000..2fcaa075 --- /dev/null +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |||
@@ -0,0 +1,31 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | <!-- <copyright> | ||
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/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="file-input-field.css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner":{ | ||
14 | "module": "js/io/ui/file-picker/file-input-field.reel", | ||
15 | "name": "FileInputField", | ||
16 | "properties": { | ||
17 | "element": {"#": "fileInputField"}, | ||
18 | "findDirectory": {"#": "findDirectory"}, | ||
19 | "newFileDirectory": {"#": "newFileDirectory"} | ||
20 | } | ||
21 | } | ||
22 | } | ||
23 | </script> | ||
24 | </head> | ||
25 | <body> | ||
26 | <div id="fileInputField" class="fileInputField"> | ||
27 | <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" /> | ||
28 | <span id="findDirectory" class="findDirectory"></span> | ||
29 | </div> | ||
30 | </body> | ||
31 | </html> \ No newline at end of file | ||