diff options
| author | Nivesh Rajbhandari | 2012-02-09 13:23:07 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 13:23:07 -0800 |
| commit | 148e6f7c00e54b0ec6fa6bb6791f0ac0920af511 (patch) | |
| tree | 889719cf024d73e2e1e93d73a40f96a2a8d27dc6 /js/components/tools-properties/pen-properties.reel/pen-properties.html | |
| parent | a9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-148e6f7c00e54b0ec6fa6bb6791f0ac0920af511.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Conflicts:
js/helper-classes/RDGE/GLMaterial.js
js/helper-classes/RDGE/GLRectangle.js
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/FlatMaterial.js
js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
js/helper-classes/RDGE/Materials/JuliaMaterial.js
js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
js/helper-classes/RDGE/Materials/MandelMaterial.js
js/helper-classes/RDGE/Materials/PlasmaMaterial.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
js/helper-classes/RDGE/Materials/TunnelMaterial.js
js/helper-classes/RDGE/Materials/TwistMaterial.js
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/src/core/script/renderer.js
js/panels/Materials/Materials.xml
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 |