diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel')
-rw-r--r-- | node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html | 4 |
1 files changed, 2 insertions, 2 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 59121b61..526d6563 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 | |||
@@ -11,14 +11,14 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "image": { | 13 | "image": { |
14 | "prototype": "montage/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": "montage/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"} |