aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
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.html32
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>