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/new-file-dialog | |
| parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/io/ui/new-file-dialog')
| -rwxr-xr-x | js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | 14 | ||||
| -rwxr-xr-x | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html index 1f9d9b9f..236b4f4e 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.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 | "hottextHeight": { | 13 | "hottextHeight": { |
| 14 | "module": "js/components/hottextunit.reel", | 14 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 15 | "name": "HotTextUnit", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "templateHeight"}, | 16 | "element": {"#": "templateHeight"}, |
| 18 | "minValue":25, | 17 | "minValue":25, |
| @@ -31,8 +30,7 @@ | |||
| 31 | }, | 30 | }, |
| 32 | 31 | ||
| 33 | "hottextWidth": { | 32 | "hottextWidth": { |
| 34 | "module": "js/components/hottextunit.reel", | 33 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 35 | "name": "HotTextUnit", | ||
| 36 | "properties": { | 34 | "properties": { |
| 37 | "element": {"#": "templateWidth"}, | 35 | "element": {"#": "templateWidth"}, |
| 38 | "minValue":25, | 36 | "minValue":25, |
| @@ -51,8 +49,7 @@ | |||
| 51 | }, | 49 | }, |
| 52 | 50 | ||
| 53 | "fileInputField":{ | 51 | "fileInputField":{ |
| 54 | "module": "js/io/ui/file-picker/file-input-field.reel", | 52 | "prototype": "js/io/ui/file-picker/file-input-field.reel", |
| 55 | "name": "FileInputField", | ||
| 56 | "properties": { | 53 | "properties": { |
| 57 | "element": {"#": "fileInputField"} | 54 | "element": {"#": "fileInputField"} |
| 58 | } | 55 | } |
| @@ -66,8 +63,7 @@ | |||
| 66 | }, | 63 | }, |
| 67 | 64 | ||
| 68 | "owner":{ | 65 | "owner":{ |
| 69 | "module": "js/io/ui/new-file-dialog/new-file-location.reel", | 66 | "prototype": "js/io/ui/new-file-dialog/new-file-location.reel", |
| 70 | "name": "NewFileLocation", | ||
| 71 | "properties": { | 67 | "properties": { |
| 72 | "element": {"#": "newfileLocation"}, | 68 | "element": {"#": "newfileLocation"}, |
| 73 | "fileInputField": {"@": "fileInputField"}, | 69 | "fileInputField": {"@": "fileInputField"}, |
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html index d4043658..58303a57 100755 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-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,16 +11,14 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "newFileLocation":{ | 13 | "newFileLocation":{ |
| 14 | "module": "js/io/ui/new-file-dialog/new-file-location.reel", | 14 | "prototype": "js/io/ui/new-file-dialog/new-file-location.reel", |
| 15 | "name": "NewFileLocation", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "right-bottom"} | 16 | "element": {"#": "right-bottom"} |
| 18 | } | 17 | } |
| 19 | }, | 18 | }, |
| 20 | 19 | ||
| 21 | "owner":{ | 20 | "owner":{ |
| 22 | "module": "js/io/ui/new-file-dialog/new-file-options-navigator.reel", | 21 | "prototype": "js/io/ui/new-file-dialog/new-file-options-navigator.reel", |
| 23 | "name": "NewFileOptionsNavigator", | ||
| 24 | "properties": { | 22 | "properties": { |
| 25 | "element": {"#": "newfile"}, | 23 | "element": {"#": "newfile"}, |
| 26 | "projectTypeTree": {"#": "projectTypeTree"}, | 24 | "projectTypeTree": {"#": "projectTypeTree"}, |