aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:16:30 -0700
committerArmen Kesablyan2012-06-20 15:16:30 -0700
commit65b989c7759af923fb9456d34bff89f91831ea1e (patch)
treee408be732a3eee71229bfc7dbf7cace998ce18de /js/components/tools-properties/ink-bottle-properties.reel
parent38f571d1fdf02d36c3816637af7b2ca2493809da (diff)
parentfc818d31de267d2b77fda3b3029ad38d48698be8 (diff)
downloadninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html10
1 files changed, 5 insertions, 5 deletions
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",