aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/overlays
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:48:34 -0700
committerJose Antonio Marquez2012-06-20 16:48:34 -0700
commit4eff115126ab946c5852d787fd596e07b156c9a5 (patch)
treef7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /node_modules/montage/ui/rich-text-editor/overlays
parent7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays')
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html34
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html32
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js2
3 files changed, 34 insertions, 34 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 9595d7ab..9bb4b0df 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
@@ -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-linkpopup.css"> 10 <link rel="stylesheet" href="rich-text-linkpopup.css">
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12{
13 "link": { 13 "link": {
14 "prototype": "ui/anchor.reel", 14 "prototype": "ui/anchor.reel",
15 "properties": { 15 "properties": {
16 "element": {"#": "link"} 16 "element": {"#": "link"}
17 } 17 }
18 }, 18 },
19 19
20 "owner": { 20 "owner": {
21 "prototype": "ui/rich-text-editor/overlays/rich-text-linkpopup.reel[RichTextLinkPopup]", 21 "prototype": "ui/rich-text-editor/overlays/rich-text-linkpopup.reel[RichTextLinkPopup]",
22 "properties": { 22 "properties": {
23 "element": {"#": "linkpopup-container"}, 23 "element": {"#": "linkpopup-container"},
24 "link": {"@": "link"} 24 "link": {"@": "link"}
25 }
26 }
27 } 25 }
26 }
27}
28 </script> 28 </script>
29</head> 29</head>
30<body> 30<body>
@@ -32,4 +32,4 @@
32 <a data-montage-id="link" target="_blank"></a> 32 <a data-montage-id="link" target="_blank"></a>
33 </div> 33 </div>
34</body> 34</body>
35</html> 35</html> \ No newline at end of file
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>
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
index c9f94565..2b0fa5c0 100644
--- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
+++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
@@ -231,7 +231,7 @@ exports.RichTextResizer = Montage.create(Component,/** @lends module:"montage/ui
231 var zero = Point.create().init(0, 0), 231 var zero = Point.create().init(0, 0),
232 framePosition = dom.convertPointFromNodeToPage(element, zero), 232 framePosition = dom.convertPointFromNodeToPage(element, zero),
233 cursor = this._cursorPosition, 233 cursor = this._cursorPosition,
234 direction = this._draggedElement.id.substring("montage-resizer-handle-".length), 234 direction = this._draggedElement.getAttribute("data-montage-id").substring("montage-resizer-handle-".length),
235 info = this._resizerFrameInfo, 235 info = this._resizerFrameInfo,
236 ratio = info.ratio, 236 ratio = info.ratio,
237 height = parseFloat(element.style.height, 10), 237 height = parseFloat(element.style.height, 10),
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:32:36 +0000