diff options
author | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
commit | 32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch) | |
tree | fbf05f2dfc91e57ab9598046ff16798ea0ae1966 /js/components/gradientpicker.reel | |
parent | 60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff) | |
parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
download | ninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/components/gradientpicker.reel')
-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": { |