diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/pen-properties.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-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/pen-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index acbedcac..68ab85f6 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-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/> |
| @@ -13,8 +13,7 @@ | |||
| 13 | { | 13 | { |
| 14 | 14 | ||
| 15 | "strokeSizeHT": { | 15 | "strokeSizeHT": { |
| 16 | "module": "js/components/hottextunit.reel", | 16 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 17 | "name": "HotTextUnit", | ||
| 18 | "properties": { | 17 | "properties": { |
| 19 | "element": {"#": "strokeSize"}, | 18 | "element": {"#": "strokeSize"}, |
| 20 | "minValue": 1, | 19 | "minValue": 1, |
| @@ -26,8 +25,7 @@ | |||
| 26 | }, | 25 | }, |
| 27 | 26 | ||
| 28 | "owner": { | 27 | "owner": { |
| 29 | "module": "js/components/tools-properties/pen-properties.reel", | 28 | "prototype": "js/components/tools-properties/pen-properties.reel", |
| 30 | "name": "PenProperties", | ||
| 31 | "properties": { | 29 | "properties": { |
| 32 | "element": {"#": "penProperties"}, | 30 | "element": {"#": "penProperties"}, |
| 33 | "_strokeSize": {"@": "strokeSizeHT"} | 31 | "_strokeSize": {"@": "strokeSizeHT"} |
| @@ -42,7 +40,7 @@ | |||
| 42 | <div data-montage-id="penProperties" class="subToolHolderPanel"> | 40 | <div data-montage-id="penProperties" class="subToolHolderPanel"> |
| 43 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> | 41 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
| 44 | <label class="label"> Stroke:</label> | 42 | <label class="label"> Stroke:</label> |
| 45 | <div id="strokeSize" class="label"></div> | 43 | <div data-montage-id="strokeSize" class="label"></div> |
| 46 | </div> | 44 | </div> |
| 47 | </div> | 45 | </div> |
| 48 | </body> | 46 | </body> |