diff options
| author | John Mayhew | 2012-04-02 16:28:39 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-04-02 16:28:39 -0700 |
| commit | b4155fb4c33675a8a7cd37473513718043fdf0ba (patch) | |
| tree | 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/components/tools-properties/rect-properties.reel/rect-properties.html | |
| parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/runtime/GLRuntime.js
js/helper-classes/RDGE/src/core/script/MeshManager.js
js/helper-classes/RDGE/src/core/script/engine.js
js/helper-classes/RDGE/src/core/script/fx/ssao.js
js/helper-classes/RDGE/src/core/script/init_state.js
js/helper-classes/RDGE/src/core/script/run_state.js
js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
js/helper-classes/RDGE/src/core/script/utilities.js
js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/lib/drawing/world.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/linear-gradient-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-blur-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
js/preloader/Preloader.js
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.html')
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index 214ff1d5..ceb761b9 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html | |||
| @@ -50,12 +50,23 @@ | |||
| 50 | } | 50 | } |
| 51 | }, | 51 | }, |
| 52 | 52 | ||
| 53 | "lockButton": { | ||
| 54 | "prototype": "montage/ui/toggle-button.reel", | ||
| 55 | "properties": { | ||
| 56 | "element": {"#": "lockButton"}, | ||
| 57 | "pressed": true, | ||
| 58 | "pressedClass": "lockUp", | ||
| 59 | "preventFocus": true, | ||
| 60 | "identifier": "ratio" | ||
| 61 | } | ||
| 62 | }, | ||
| 63 | |||
| 53 | "owner": { | 64 | "owner": { |
| 54 | "module": "js/components/tools-properties/rect-properties.reel", | 65 | "module": "js/components/tools-properties/rect-properties.reel", |
| 55 | "name": "RectProperties", | 66 | "name": "RectProperties", |
| 56 | "properties": { | 67 | "properties": { |
| 57 | "element": {"#": "rectProperties"}, | 68 | "element": {"#": "rectProperties"}, |
| 58 | "lockButton": {"#": "lockButton"}, | 69 | "lockButton": {"@": "lockButton"}, |
| 59 | "TLRadiusControl": {"@": "hottext1"}, | 70 | "TLRadiusControl": {"@": "hottext1"}, |
| 60 | "TRRadiusControl": {"@": "hottext2"}, | 71 | "TRRadiusControl": {"@": "hottext2"}, |
| 61 | "BLRadiusControl": {"@": "hottext3"}, | 72 | "BLRadiusControl": {"@": "hottext3"}, |
| @@ -69,7 +80,8 @@ | |||
| 69 | 80 | ||
| 70 | <body> | 81 | <body> |
| 71 | <div id="rectProperties" class="rectProperties"> | 82 | <div id="rectProperties" class="rectProperties"> |
| 72 | <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button> | 83 | <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>--> |
| 84 | <button id="lockButton" class="unlock" style="margin-left:20px"></button> | ||
| 73 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> | 85 | <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> |
| 74 | <div id="TLRadiusControl" class="label"></div> | 86 | <div id="TLRadiusControl" class="label"></div> |
| 75 | <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> | 87 | <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> |