diff options
author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel | |
parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel')
2 files changed, 5 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> |
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js index 90342d81..02598030 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js | |||
@@ -135,6 +135,7 @@ exports.RichTextLinkPopup = Montage.create(Component,/** @lends module:"montage/ | |||
135 | if (this._editor.activeOverlay == this) { | 135 | if (this._editor.activeOverlay == this) { |
136 | this._editor.hideOverlay(); | 136 | this._editor.hideOverlay(); |
137 | } | 137 | } |
138 | this.target = null; | ||
138 | 139 | ||
139 | return false; | 140 | return false; |
140 | } | 141 | } |