diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html')
| -rw-r--r-- | node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html index 526d6563..d7dbe11c 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html | |||
| @@ -6,25 +6,25 @@ | |||
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html> | 7 | <html> |
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <meta charset="utf-8"> |
| 10 | <link rel="stylesheet" type="text/css" href="rich-text-resizer.css"> | 10 | <link rel="stylesheet" href="rich-text-resizer.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "image": { | 13 | "image": { |
| 14 | "prototype": "ui/image.reel", | 14 | "prototype": "ui/image.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "image"} | 16 | "element": {"#": "image"} |
| 17 | } | 17 | } |
| 18 | }, | 18 | }, |
| 19 | 19 | ||
| 20 | "owner": { | 20 | "owner": { |
| 21 | "prototype": "ui/rich-text-editor/overlays/rich-text-resizer.reel", | 21 | "prototype": "ui/rich-text-editor/overlays/rich-text-resizer.reel", |
| 22 | "properties": { | 22 | "properties": { |
| 23 | "element": {"#": "resizer-container"}, | 23 | "element": {"#": "resizer-container"}, |
| 24 | "image": {"@": "image"} | 24 | "image": {"@": "image"} |
| 25 | } | ||
| 26 | } | ||
| 27 | } | 25 | } |
| 26 | } | ||
| 27 | } | ||
| 28 | </script> | 28 | </script> |
| 29 | </head> | 29 | </head> |
| 30 | <body> | 30 | <body> |