diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html')
| -rw-r--r-- | node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html index 1e2ec2cc..04b52dd6 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html | |||
| @@ -11,16 +11,14 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "link": { | 13 | "link": { |
| 14 | "module": "montage/ui/anchor.reel", | 14 | "prototype": "montage/ui/anchor.reel", |
| 15 | "name": "Anchor", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "link"} | 16 | "element": {"#": "link"} |
| 18 | } | 17 | } |
| 19 | }, | 18 | }, |
| 20 | 19 | ||
| 21 | "owner": { | 20 | "owner": { |
| 22 | "module": "montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel", | 21 | "prototype": "montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel[RichTextLinkPopup]", |
| 23 | "name": "RichTextLinkPopup", | ||
| 24 | "properties": { | 22 | "properties": { |
| 25 | "element": {"#": "linkpopup-container"}, | 23 | "element": {"#": "linkpopup-container"}, |
| 26 | "link": {"@": "link"} | 24 | "link": {"@": "link"} |
| @@ -30,8 +28,8 @@ | |||
| 30 | </script> | 28 | </script> |
| 31 | </head> | 29 | </head> |
| 32 | <body> | 30 | <body> |
| 33 | <div id="linkpopup-container" class="montage-link-popup" contentEditable="false"> | 31 | <div data-montage-id="linkpopup-container" class="montage-link-popup" contentEditable="false"> |
| 34 | <a id="link" target="_blank"></a> | 32 | <a data-montage-id="link" target="_blank"></a> |
| 35 | </div> | 33 | </div> |
| 36 | </body> | 34 | </body> |
| 37 | </html> | 35 | </html> |