diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/colorwheel.reel/colorwheel.html | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/colorwheel.reel/colorwheel.html')
| -rwxr-xr-x | js/components/colorwheel.reel/colorwheel.html | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 707bd637..5af6dff8 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -18,7 +18,11 @@ | |||
| 18 | "owner": { | 18 | "owner": { |
| 19 | "prototype": "js/components/colorwheel.reel[ColorWheel]", | 19 | "prototype": "js/components/colorwheel.reel[ColorWheel]", |
| 20 | "properties": { | 20 | "properties": { |
| 21 | "element": {"#": "colorwheel"} | 21 | "element": {"#": "colorwheel"}, |
| 22 | "wheel": {"#": "wheel"}, | ||
| 23 | "wheelSelect": {"#": "wselect"}, | ||
| 24 | "swatch": {"#": "swatch"}, | ||
| 25 | "swatchSelect": {"#": "sselect"} | ||
| 22 | 26 | ||
| 23 | } | 27 | } |
| 24 | } | 28 | } |
| @@ -30,10 +34,10 @@ | |||
| 30 | <body> | 34 | <body> |
| 31 | 35 | ||
| 32 | <div data-montage-id="colorwheel" class="colorwheel"> | 36 | <div data-montage-id="colorwheel" class="colorwheel"> |
| 33 | <canvas></canvas> | 37 | <canvas data-montage-id="wheel"></canvas> |
| 34 | <canvas></canvas> | 38 | <canvas data-montage-id="swatch"></canvas> |
| 35 | <canvas></canvas> | 39 | <canvas data-montage-id="sselect"></canvas> |
| 36 | <canvas></canvas> | 40 | <canvas data-montage-id="wselect"></canvas> |
| 37 | </div> | 41 | </div> |
| 38 | 42 | ||
| 39 | </body> | 43 | </body> |