aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom-rows
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/panels/properties.reel/sections/custom-rows
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html6
3 files changed, 8 insertions, 16 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 },