aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-24 08:29:30 -0700
committerPushkar Joshi2012-04-24 08:29:30 -0700
commite7bbd9b08b4cd87530596b370366d994ca766650 (patch)
tree8862827848c55b36cc2e2bc0bb0c07a5e50dc1ca /js/components/gradientpicker.reel
parentf57727d36709bbda03b45788dc12faf31a591b40 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-e7bbd9b08b4cd87530596b370366d994ca766650.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/gradientpicker.reel')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html10
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": {