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/panels/properties.reel/sections/position-and-size.reel | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
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 | }, |