diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/panels/properties.reel/sections/position-and-size.reel | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/panels/properties.reel/sections/position-and-size.reel')
| -rwxr-xr-x | js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index f50724c5..59bbe346 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |||
| @@ -10,8 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
| 11 | { | 11 | { |
| 12 | "owner": { | 12 | "owner": { |
| 13 | "module" : "js/panels/properties.reel/sections/position-and-size.reel", | 13 | "prototype" : "js/panels/properties.reel/sections/position-and-size.reel[PosSize]", |
| 14 | "name" : "PosSize", | ||
| 15 | "properties" : { | 14 | "properties" : { |
| 16 | "element" : {"#": "section"}, | 15 | "element" : {"#": "section"}, |
| 17 | "position": {"#": "position"}, | 16 | "position": {"#": "position"}, |
| @@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 25 | } | 24 | } |
| 26 | }, | 25 | }, |
| 27 | "PosX": { | 26 | "PosX": { |
| 28 | "module": "js/components/hottextunit.reel", | 27 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 29 | "name": "HotTextUnit", | ||
| 30 | "properties": { | 28 | "properties": { |
| 31 | "element": {"#": "PosX"}, | 29 | "element": {"#": "PosX"}, |
| 32 | "maxValue": 10000, | 30 | "maxValue": 10000, |
| @@ -41,8 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 41 | } | 39 | } |
| 42 | }, | 40 | }, |
| 43 | "PosY": { | 41 | "PosY": { |
| 44 | "module": "js/components/hottextunit.reel", | 42 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 45 | "name": "HotTextUnit", | ||
| 46 | "properties": { | 43 | "properties": { |
| 47 | "element": {"#": "PosY"}, | 44 | "element": {"#": "PosY"}, |
| 48 | "maxValue": 10000, | 45 | "maxValue": 10000, |
| @@ -57,8 +54,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 57 | } | 54 | } |
| 58 | }, | 55 | }, |
| 59 | "PosH": { | 56 | "PosH": { |
| 60 | "module": "js/components/hottextunit.reel", | 57 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 61 | "name": "HotTextUnit", | ||
| 62 | "properties": { | 58 | "properties": { |
| 63 | "element": {"#": "PosH"} | 59 | "element": {"#": "PosH"} |
| 64 | }, | 60 | }, |
| @@ -71,8 +67,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 71 | } | 67 | } |
| 72 | }, | 68 | }, |
| 73 | "PosW": { | 69 | "PosW": { |
| 74 | "module": "js/components/hottextunit.reel", | 70 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 75 | "name": "HotTextUnit", | ||
| 76 | "properties": { | 71 | "properties": { |
| 77 | "element": {"#": "PosW"} | 72 | "element": {"#": "PosW"} |
| 78 | }, | 73 | }, |