diff options
| author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
| commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
| tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/io/ui/file-picker | |
| parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/io/ui/file-picker')
| -rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.html | 5 | ||||
| -rwxr-xr-x | js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html | 5 |
2 files changed, 4 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..9113eb80 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"}, |
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html index f46068ec..7100a738 100755 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.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/> |
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner":{ | 13 | "owner":{ |
| 14 | "module": "js/io/ui/file-picker/picker-navigator.reel", | 14 | "prototype": "js/io/ui/file-picker/picker-navigator.reel", |
| 15 | "name":"PickerNavigator", | ||
| 16 | "properties":{ | 15 | "properties":{ |
| 17 | "element": {"#": "picker"}, | 16 | "element": {"#": "picker"}, |
| 18 | "filterVal" : {"#": "filterVal"}, | 17 | "filterVal" : {"#": "filterVal"}, |