diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/panels/properties.reel/properties.html | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/properties.reel/properties.html')
| -rwxr-xr-x | js/panels/properties.reel/properties.html | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index d212ae80..554d1477 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.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/> |
| @@ -27,8 +27,7 @@ | |||
| 27 | }, | 27 | }, |
| 28 | 28 | ||
| 29 | "elementClass": { | 29 | "elementClass": { |
| 30 | "module": "montage/ui/textfield.reel", | 30 | "prototype": "montage/ui/textfield.reel", |
| 31 | "name": "Textfield", | ||
| 32 | "properties": { | 31 | "properties": { |
| 33 | "element": {"#": "elementClass"}, | 32 | "element": {"#": "elementClass"}, |
| 34 | "readOnly": false | 33 | "readOnly": false |
| @@ -36,8 +35,7 @@ | |||
| 36 | }, | 35 | }, |
| 37 | 36 | ||
| 38 | "PosSizeSection": { | 37 | "PosSizeSection": { |
| 39 | "module": "js/panels/properties.reel/section.reel", | 38 | "prototype": "js/panels/properties.reel/section.reel", |
| 40 | "name": "Section", | ||
| 41 | "properties": { | 39 | "properties": { |
| 42 | "element": {"#": "PosSize"}, | 40 | "element": {"#": "PosSize"}, |
| 43 | "content" : {"@": "PosSize"}, | 41 | "content" : {"@": "PosSize"}, |
| @@ -45,12 +43,10 @@ | |||
| 45 | } | 43 | } |
| 46 | }, | 44 | }, |
| 47 | "PosSize": { | 45 | "PosSize": { |
| 48 | "module": "js/panels/properties.reel/sections/position-and-size.reel", | 46 | "prototype": "js/panels/properties.reel/sections/position-and-size.reel[PosSize]" |
| 49 | "name": "PosSize" | ||
| 50 | }, | 47 | }, |
| 51 | "threeDSection": { | 48 | "threeDSection": { |
| 52 | "module": "js/panels/properties.reel/section.reel", | 49 | "prototype": "js/panels/properties.reel/section.reel", |
| 53 | "name": "Section", | ||
| 54 | "properties": { | 50 | "properties": { |
| 55 | "element": {"#": "threeD"}, | 51 | "element": {"#": "threeD"}, |
| 56 | "content" : {"@": "threeDProperties"}, | 52 | "content" : {"@": "threeDProperties"}, |
| @@ -58,13 +54,11 @@ | |||
| 58 | } | 54 | } |
| 59 | }, | 55 | }, |
| 60 | "threeDProperties": { | 56 | "threeDProperties": { |
| 61 | "module": "js/panels/properties.reel/sections/three-d-view.reel", | 57 | "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]" |
| 62 | "name": "ThreeD" | ||
| 63 | }, | 58 | }, |
| 64 | 59 | ||
| 65 | "CustomSections": { | 60 | "CustomSections": { |
| 66 | "module": "montage/ui/repetition.reel", | 61 | "prototype": "montage/ui/repetition.reel", |
| 67 | "name": "Repetition", | ||
| 68 | "properties": { | 62 | "properties": { |
| 69 | "element": {"#": "customSections"} | 63 | "element": {"#": "customSections"} |
| 70 | }, | 64 | }, |
| @@ -78,8 +72,7 @@ | |||
| 78 | }, | 72 | }, |
| 79 | 73 | ||
| 80 | "customSection": { | 74 | "customSection": { |
| 81 | "module": "js/panels/properties.reel/section.reel", | 75 | "prototype": "js/panels/properties.reel/section.reel", |
| 82 | "name": "Section", | ||
| 83 | "properties": { | 76 | "properties": { |
| 84 | "element": {"#": "customSection"} | 77 | "element": {"#": "customSection"} |
| 85 | }, | 78 | }, |
| @@ -98,8 +91,7 @@ | |||
| 98 | }, | 91 | }, |
| 99 | 92 | ||
| 100 | "owner": { | 93 | "owner": { |
| 101 | "module": "js/panels/properties.reel", | 94 | "prototype": "js/panels/properties.reel", |
| 102 | "name": "Properties", | ||
| 103 | "properties": { | 95 | "properties": { |
| 104 | "element": {"#": "propertiesPanel"}, | 96 | "element": {"#": "propertiesPanel"}, |
| 105 | "elementName": {"@": "elementName"}, | 97 | "elementName": {"@": "elementName"}, |