diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/components/tools-properties/pen-properties.reel/pen-properties.html | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel/pen-properties.html')
| -rw-r--r-- | js/components/tools-properties/pen-properties.reel/pen-properties.html | 22 |
1 files changed, 19 insertions, 3 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 7af35a03..74a3a747 100644 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -12,12 +12,25 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | 14 | ||
| 15 | "strokeSizeHT": { | ||
| 16 | "module": "js/components/hottextunit.reel", | ||
| 17 | "name": "HotTextUnit", | ||
| 18 | "properties": { | ||
| 19 | "element": {"#": "strokeSize"}, | ||
| 20 | "minValue": 1, | ||
| 21 | "maxValue": 100, | ||
| 22 | "value": 1, | ||
| 23 | "decimalPlace": 10, | ||
| 24 | "acceptableUnits" : ["px", "pt"] | ||
| 25 | } | ||
| 26 | }, | ||
| 27 | |||
| 15 | "owner": { | 28 | "owner": { |
| 16 | "module": "js/components/tools-properties/pen-properties.reel", | 29 | "module": "js/components/tools-properties/pen-properties.reel", |
| 17 | "name": "PenProperties", | 30 | "name": "PenProperties", |
| 18 | "properties": { | 31 | "properties": { |
| 19 | "element": {"#": "penProperties"}, | 32 | "element": {"#": "penProperties"}, |
| 20 | "reset": {"#": "resetPenTool"} | 33 | "_strokeSize": {"@": "strokeSizeHT"} |
| 21 | } | 34 | } |
| 22 | } | 35 | } |
| 23 | } | 36 | } |
| @@ -26,9 +39,12 @@ | |||
| 26 | </head> | 39 | </head> |
| 27 | 40 | ||
| 28 | <body> | 41 | <body> |
| 29 | <div id="penProperties" class="subToolHolderPanel"> | 42 | <div id="penProperties" class="subToolHolderPanel"> |
| 30 | <button id="resetPenTool" tabindex="0" class="montage-button" aria-role="button" aria-busy="false">Reset</button> | 43 | <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;"> |
| 44 | <label class="label"> Stroke:</label> | ||
| 45 | <div id="strokeSize" class="label"></div> | ||
| 31 | </div> | 46 | </div> |
| 47 | </div> | ||
| 32 | </body> | 48 | </body> |
| 33 | 49 | ||
| 34 | </html> \ No newline at end of file | 50 | </html> \ No newline at end of file |