diff options
| author | Jose Antonio Marquez | 2012-04-20 10:44:02 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-20 10:44:02 -0700 |
| commit | 0b7848540a7ca84b7c67821fedc275cf243eff2f (patch) | |
| tree | a26b2986d412a02eb93fc7fa1b0f495cab40e757 | |
| parent | 154d1a8fdbbe050dbfc97cd13baa8981d8fc1e47 (diff) | |
| parent | 8a546291a9d0de3bda1a7765ae9008f2ad052bba (diff) | |
| download | ninja-0b7848540a7ca84b7c67821fedc275cf243eff2f.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
124 files changed, 8328 insertions, 4892 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 0374e6a3..a9fbfbd9 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -12,15 +12,7 @@ | |||
| 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 13 | 13 | ||
| 14 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> | 14 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> |
| 15 | 15 | ||
| 16 | <script type="text/m-objects"> | ||
| 17 | { | ||
| 18 | "$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", { | ||
| 19 | "element": E("#colorwheel") | ||
| 20 | }) | ||