aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:47:37 -0700
committerJose Antonio Marquez2012-06-20 16:47:37 -0700
commit313a62245400e6c8cfa6d2f02c603cc7f01ddfc6 (patch)
treec207d1290be0e894a57b03098bbb7bbe5f2aee86 /js/components/tools-properties
parent2496e0d0b0ac5f8c53b12de77f0feda69ce4a2f4 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-313a62245400e6c8cfa6d2f02c603cc7f01ddfc6.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html4
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html10
2 files changed, 7 insertions, 7 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index ca447b8b..cf68520f 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -12,7 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "useFillColor": { 14 "useFillColor": {
15 "prototype": "montage/ui/checkbox.reel", 15 "prototype": "montage/ui/input-checkbox.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "useFillColor"}, 17 "element": {"#": "useFillColor"},
18 "identifier": "useFillColor", 18 "identifier": "useFillColor",
@@ -21,7 +21,7 @@
21 }, 21 },
22 22
23 "useWebGL": { 23 "useWebGL": {
24 "prototype": "montage/ui/checkbox.reel", 24 "prototype": "montage/ui/input-checkbox.reel",
25 "properties": { 25 "properties": {
26 "element": {"#": "useWebGL"}, 26 "element": {"#": "useWebGL"},
27 "identifier": "useWebGL", 27 "identifier": "useWebGL",
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 5620eed8..579930f0 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -12,7 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "useStrokeColor": { 14 "useStrokeColor": {
15 "prototype": "montage/ui/checkbox.reel", 15 "prototype": "montage/ui/input-checkbox.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "useStrokeColor"}, 17 "element": {"#": "useStrokeColor"},
18 "identifier": "useStrokeColor", 18 "identifier": "useStrokeColor",
@@ -21,7 +21,7 @@
21 }, 21 },
22 22
23 "useBorderWidth": { 23 "useBorderWidth": {
24 "prototype": "montage/ui/checkbox.reel", 24 "prototype": "montage/ui/input-checkbox.reel",
25 "properties": { 25 "properties": {
26 "element": {"#": "useBorderWidth"}, 26 "element": {"#": "useBorderWidth"},
27 "identifier": "useBorderWidth", 27 "identifier": "useBorderWidth",
@@ -49,7 +49,7 @@
49 }, 49 },
50 50
51 "useBorderStyle": { 51 "useBorderStyle": {
52 "prototype": "montage/ui/checkbox.reel", 52 "prototype": "montage/ui/input-checkbox.reel",
53 "properties": { 53 "properties": {
54 "element": {"#": "useBorderStyle"}, 54 "element": {"#": "useBorderStyle"},
55 "identifier": "useBorderStyle", 55 "identifier": "useBorderStyle",
@@ -65,7 +65,7 @@
65 }, 65 },
66 66
67 "useStrokeSize": { 67 "useStrokeSize": {
68 "prototype": "montage/ui/checkbox.reel", 68 "prototype": "montage/ui/input-checkbox.reel",
69 "properties": { 69 "properties": {
70 "element": {"#": "useStrokeSize"}, 70 "element": {"#": "useStrokeSize"},
71 "identifier": "useStrokeSize", 71 "identifier": "useStrokeSize",
@@ -94,7 +94,7 @@
94 }, 94 },
95 95
96 "useWebGL": { 96 "useWebGL": {
97 "prototype": "montage/ui/checkbox.reel", 97 "prototype": "montage/ui/input-checkbox.reel",
98 "properties": { 98 "properties": {
99 "element": {"#": "useWebGL"}, 99 "element": {"#": "useWebGL"},
100 "identifier": "useWebGL", 100 "identifier": "useWebGL",