diff options
author | Pushkar Joshi | 2012-04-24 08:29:30 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-24 08:29:30 -0700 |
commit | e7bbd9b08b4cd87530596b370366d994ca766650 (patch) | |
tree | 8862827848c55b36cc2e2bc0bb0c07a5e50dc1ca /js/components/colorwheel.reel/colorwheel.html | |
parent | f57727d36709bbda03b45788dc12faf31a591b40 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-e7bbd9b08b4cd87530596b370366d994ca766650.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/colorwheel.reel/colorwheel.html')
-rwxr-xr-x | js/components/colorwheel.reel/colorwheel.html | 10 |
1 files changed, 1 insertions, 9 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 | }) | ||
21 | } | ||
22 | </script> | ||
23 | |||
24 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
25 | { | 17 | { |
26 | "owner": { | 18 | "owner": { |