diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/colorwheel.reel/colorwheel.html | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
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> |