diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/colorwheel.reel/colorwheel.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/colorwheel.reel/colorwheel.html')
| -rwxr-xr-x | js/components/colorwheel.reel/colorwheel.html | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index b39479a8..2de64d7e 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility, Inc |
| 5 | All Rights Reserved. | 5 | All Rights Reserved. |
| @@ -31,39 +31,39 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 31 | </copyright> | 31 | </copyright> |
| 32 | --> | 32 | --> |
| 33 | <html lang="en"> | 33 | <html lang="en"> |
| 34 | <head> | 34 | <head> |
| 35 | |||
| 36 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 37 | |||
| 38 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> | ||
| 39 | 35 | ||
| 40 | <script type="text/montage-serialization"> | 36 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 41 | { | ||
| 42 | "owner": { | ||
| 43 | "prototype": "js/components/colorwheel.reel[ColorWheel]", | ||
| 44 | "properties": { | ||
| 45 | "element": {"#": "colorwheel"}, | ||
| 46 | "wheel": {"#": "wheel"}, | ||
| 47 | "wheelSelect": {"#": "wselect"}, | ||
| 48 | "swatch": {"#": "swatch"}, | ||
| 49 | "swatchSelect": {"#": "sselect"} | ||
| 50 | 37 | ||
| 51 | } | 38 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> |
| 52 | } | 39 | |
| 53 | } | 40 | <script type="text/montage-serialization"> |
| 54 | </script> | 41 | { |
| 55 | 42 | "owner": { | |
| 56 | </head> | 43 | "prototype": "js/components/colorwheel.reel[ColorWheel]", |
| 57 | 44 | "properties": { | |
| 58 | <body> | 45 | "element": {"#": "colorwheel"}, |
| 59 | 46 | "wheel": {"#": "wheel"}, | |
| 60 | <div data-montage-id="colorwheel" class="colorwheel"> | 47 | "wheelSelect": {"#": "wselect"}, |
| 61 | <canvas data-montage-id="wheel"></canvas> | 48 | "swatch": {"#": "swatch"}, |
| 62 | <canvas data-montage-id="swatch"></canvas> | 49 | "swatchSelect": {"#": "sselect"} |
| 63 | <canvas data-montage-id="sselect"></canvas> | 50 | |
| 64 | <canvas data-montage-id="wselect"></canvas> | 51 | } |
| 65 | </div> | 52 | } |
| 66 | 53 | } | |
| 67 | </body> | 54 | </script> |
| 55 | |||
| 56 | </head> | ||
| 57 | |||
| 58 | <body> | ||
| 59 | |||
| 60 | <div data-montage-id="colorwheel" class="colorwheel"> | ||
| 61 | <canvas data-montage-id="wheel"></canvas> | ||
| 62 | <canvas data-montage-id="swatch"></canvas> | ||
| 63 | <canvas data-montage-id="sselect"></canvas> | ||
| 64 | <canvas data-montage-id="wselect"></canvas> | ||
| 65 | </div> | ||
| 66 | |||
| 67 | </body> | ||
| 68 | 68 | ||
| 69 | </html> | 69 | </html> |