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/sections | |
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/sections')
6 files changed, 28 insertions, 56 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html index 58a50a0d..990dc739 100755 --- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |||
@@ -9,8 +9,7 @@ | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "owner": { | 11 | "owner": { |
12 | "module" : "js/panels/properties.reel/sections/custom-rows/color-select.reel", | 12 | "prototype" : "js/panels/properties.reel/sections/custom-rows/color-select.reel", |
13 | "name" : "ColorSelect", | ||
14 | "properties" : { | 13 | "properties" : { |
15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
16 | "Stroke" : {"#": "Stroke"}, | 15 | "Stroke" : {"#": "Stroke"}, |
@@ -22,16 +21,14 @@ | |||
22 | 21 | ||
23 | 22 | ||
24 | "colorChip": { | 23 | "colorChip": { |
25 | "module" : "js/components/ui/color-chip.reel", | 24 | "prototype" : "js/components/ui/color-chip.reel", |
26 | "name" : "ColorChip", | ||
27 | "properties" : { | 25 | "properties" : { |
28 | "element" : {"#": "Stroke"} | 26 | "element" : {"#": "Stroke"} |
29 | } | 27 | } |
30 | }, | 28 | }, |
31 | 29 | ||
32 | "colorChip2": { | 30 | "colorChip2": { |
33 | "module" : "js/components/ui/color-chip.reel", | 31 | "prototype" : "js/components/ui/color-chip.reel", |
34 | "name" : "ColorChip", | ||
35 | "properties" : { | 32 | "properties" : { |
36 | "element" : {"#": "Fill"}, | 33 | "element" : {"#": "Fill"}, |
37 | "mode": "fill" | 34 | "mode": "fill" |
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index be4ae431..d1b5f28b 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |||
@@ -9,8 +9,7 @@ | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "owner": { | 11 | "owner": { |
12 | "module" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel", | 12 | "prototype" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel", |
13 | "name" : "DualRow", | ||
14 | "properties" : { | 13 | "properties" : { |
15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
16 | "slot" : {"@": "slot"}, | 15 | "slot" : {"@": "slot"}, |
@@ -18,8 +17,7 @@ | |||
18 | } | 17 | } |
19 | }, | 18 | }, |
20 | "slot": { | 19 | "slot": { |
21 | "module": "montage/ui/slot.reel", | 20 | "prototype": "montage/ui/slot.reel", |
22 | "name": "Slot", | ||
23 | "properties": { | 21 | "properties": { |
24 | "element": { "#": "slotElement" } | 22 | "element": { "#": "slotElement" } |
25 | }, | 23 | }, |
@@ -31,8 +29,7 @@ | |||
31 | } | 29 | } |
32 | }, | 30 | }, |
33 | "slot2": { | 31 | "slot2": { |
34 | "module": "montage/ui/slot.reel", | 32 | "prototype": "montage/ui/slot.reel", |
35 | "name": "Slot", | ||
36 | "properties": { | 33 | "properties": { |
37 | "element": { "#": "slotElement2" } | 34 | "element": { "#": "slotElement2" } |
38 | }, | 35 | }, |
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index 4de3f1ae..b606e5db 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |||
@@ -9,16 +9,14 @@ | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "owner": { | 11 | "owner": { |
12 | "module" : "js/panels/properties.reel/sections/custom-rows/single-row.reel", | 12 | "prototype" : "js/panels/properties.reel/sections/custom-rows/single-row.reel", |
13 | "name" : "SingleRow", | ||
14 | "properties" : { | 13 | "properties" : { |
15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
16 | "slot" : {"@": "slot"} | 15 | "slot" : {"@": "slot"} |
17 | } | 16 | } |
18 | }, | 17 | }, |
19 | "slot": { | 18 | "slot": { |
20 | "module": "montage/ui/slot.reel", | 19 | "prototype": "montage/ui/slot.reel", |
21 | "name": "Slot", | ||
22 | "properties": { | 20 | "properties": { |
23 | "element": { "#": "slotElement" } | 21 | "element": { "#": "slotElement" } |
24 | }, | 22 | }, |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html index 99a68264..cc48d2e7 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.html +++ b/js/panels/properties.reel/sections/custom.reel/custom.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/custom.reel", | 13 | "prototype" : "js/panels/properties.reel/sections/custom.reel[CustomSection]", |
14 | "name" : "CustomSection", | ||
15 | "properties" : { | 14 | "properties" : { |
16 | "element" : {"#": "section"}, | 15 | "element" : {"#": "section"}, |
17 | "repeat" : {"@": "repeat"} | 16 | "repeat" : {"@": "repeat"} |
@@ -19,8 +18,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
19 | }, | 18 | }, |
20 | 19 | ||
21 | "repeat": { | 20 | "repeat": { |
22 | "module": "montage/ui/repetition.reel", | 21 | "prototype": "montage/ui/repetition.reel", |
23 | "name": "Repetition", | ||
24 | "properties": { | 22 | "properties": { |
25 | "element" : {"#": "repetitionContainer"} | 23 | "element" : {"#": "repetitionContainer"} |
26 | }, | 24 | }, |
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
34 | }, | 32 | }, |
35 | 33 | ||
36 | "slot": { | 34 | "slot": { |
37 | "module": "montage/ui/slot.reel", | 35 | "prototype": "montage/ui/slot.reel", |
38 | "name": "Slot", | ||
39 | "properties": { | 36 | "properties": { |
40 | "element": { "#": "repeitionContent" } | 37 | "element": { "#": "repeitionContent" } |
41 | }, | 38 | }, |
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 | } |