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/custom-rows/dual-row.reel/dual-row.html | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html')
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 9 |
1 files changed, 3 insertions, 6 deletions
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 | }, |