diff options
author | Jonathan Duran | 2012-04-20 07:54:19 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-20 07:54:19 -0700 |
commit | 2e27ce188f77ea1d4ef8a9c08bc853179c3f7c8b (patch) | |
tree | dd58da64aaadf786afe81ba27d87ac3f5c46dddc /js/components/gradientpicker.reel/gradientpicker.html | |
parent | 4465a66996f2b022ab9e838e028415fd87cfa405 (diff) | |
parent | 8a546291a9d0de3bda1a7765ae9008f2ad052bba (diff) | |
download | ninja-2e27ce188f77ea1d4ef8a9c08bc853179c3f7c8b.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/gradientpicker.reel/gradientpicker.html')
-rwxr-xr-x | js/components/gradientpicker.reel/gradientpicker.html | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html index 361e36b2..f71c6705 100755 --- a/js/components/gradientpicker.reel/gradientpicker.html +++ b/js/components/gradientpicker.reel/gradientpicker.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/gradientpicker.css"> | 14 | <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> |
15 | 15 | ||
16 | <script type="text/m-objects"> | ||
17 | { | ||
18 | "$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", { | ||
19 | "element": E("#gradientpicker") | ||
20 | }) | ||
21 | } | ||
22 | </script> | ||
23 | |||
24 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
25 | { | 17 | { |
26 | "owner": { | 18 | "owner": { |