diff options
| author | Ananya Sen | 2012-04-23 10:53:45 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-04-23 10:53:45 -0700 |
| commit | 6e2d8c8b7e981de2a7ede45d707614307e811cad (patch) | |
| tree | 94d5455c90439548c89d811a03d675e94cf5d27c | |
| parent | 2fafe26f74f342388b97960e7a58e3f45d8d961f (diff) | |
| parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
| download | ninja-6e2d8c8b7e981de2a7ede45d707614307e811cad.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
101 files changed, 7590 insertions, 4127 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": { |
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": { |