aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html9
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 },