aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html14
1 files changed, 5 insertions, 9 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 81facc49..010e77b2 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
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -36,8 +36,7 @@
36 }, 36 },
37 37
38 "borderWidthHT": { 38 "borderWidthHT": {
39 "module": "js/components/hottextunit.reel", 39 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
40 "name": "HotTextUnit",
41 "properties": { 40 "properties": {
42 "element": {"#": "borderWidth"}, 41 "element": {"#": "borderWidth"},
43 "minValue": 1, 42 "minValue": 1,
@@ -96,8 +95,7 @@
96 }, 95 },
97 96
98 "strokeSizeHT": { 97 "strokeSizeHT": {
99 "module": "js/components/hottextunit.reel", 98 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
100 "name": "HotTextUnit",
101 "properties": { 99 "properties": {
102 "element": {"#": "strokeSize"}, 100 "element": {"#": "strokeSize"},
103 "minValue": 1, 101 "minValue": 1,
@@ -125,8 +123,7 @@
125 }, 123 },
126 124
127 "_strokeMaterialCB": { 125 "_strokeMaterialCB": {
128 "module": "js/components/combobox.reel", 126 "prototype": "js/components/combobox.reel",
129 "name": "Combobox",
130 "properties": { 127 "properties": {
131 "element": {"#": "strokeMaterialIBCB"}, 128 "element": {"#": "strokeMaterialIBCB"},
132 "labelField": "_name", 129 "labelField": "_name",
@@ -135,8 +132,7 @@
135 }, 132 },
136 133
137 "owner": { 134 "owner": {
138 "module": "js/components/tools-properties/ink-bottle-properties.reel", 135 "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
139 "name": "InkBottleProperties",
140 "properties": { 136 "properties": {
141 "element": {"#": "inkBottleProperties"}, 137 "element": {"#": "inkBottleProperties"},
142 138