aboutsummaryrefslogtreecommitdiff
path: root/js/components/colorwheel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-23 15:58:27 -0700
committerValerio Virgillito2012-04-23 15:58:27 -0700
commit4ab2a55ba2175c72f859c428122a166f8af74140 (patch)
tree3f383cb4b9e92dcb7f80eed62ff6cbc467062448 /js/components/colorwheel.reel
parent3f8f224170937d498d3a03c706494408a6b4bf1d (diff)
parent5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
downloadninja-4ab2a55ba2175c72f859c428122a166f8af74140.tar.gz
Merge branch 'refs/heads/master' into stage-document-architecture
Diffstat (limited to 'js/components/colorwheel.reel')
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html10
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": {