aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 22:53:07 -0700
committerValerio Virgillito2012-05-03 22:53:07 -0700
commit24b483db367291b72170f969de78efcb1a9b95bd (patch)
treea691a7803cefbfa76a6331a50cbeebcd16287d91 /node_modules/montage/ui/rich-text-editor
parentdc93269cfa7c315d22d85c8217e2412749643f28 (diff)
downloadninja-24b483db367291b72170f969de78efcb1a9b95bd.tar.gz
integrating the latest montage version
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor')
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html10
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js1
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css32
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html26
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js10
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js34
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html10
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js223
8 files changed, 195 insertions, 151 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 }
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css
index 3147fc67..9f9affab 100644
--- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css
+++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css
@@ -30,94 +30,94 @@
30 border-radius: 5px; 30 border-radius: 5px;
31} 31}
32 32
33#montage-resizer-handle-n { 33.montage-resizer-handle.n {
34 top: -4px; 34 top: -4px;
35 left: 50%; 35 left: 50%;
36 margin-left: -4px; 36 margin-left: -4px;
37 cursor: n-resize; 37 cursor: n-resize;
38} 38}
39 39
40#montage-resizer-handle-n:hover { 40.montage-resizer-handle.n:hover {
41 top: -5px; 41 top: -5px;
42 margin-left: -5px; 42 margin-left: -5px;
43} 43}
44 44
45#montage-resizer-handle-ne { 45.montage-resizer-handle.ne {
46 top: -4px; 46 top: -4px;
47 right: -4px; 47 right: -4px;
48 cursor: ne-resize; 48 cursor: ne-resize;
49} 49}
50 50
51#montage-resizer-handle-ne:hover { 51.montage-resizer-handle.ne:hover {
52 top: -5px; 52 top: -5px;
53 right: -5px; 53 right: -5px;
54} 54}
55 55
56#montage-resizer-handle-e { 56.montage-resizer-handle.e {
57 right: -4px; 57 right: -4px;
58 top: 50%; 58 top: 50%;
59 margin-top: -4px; 59 margin-top: -4px;
60 cursor: e-resize; 60 cursor: e-resize;
61} 61}
62 62
63#montage-resizer-handle-e:hover { 63.montage-resizer-handle.e:hover {
64 right: -5px; 64 right: -5px;
65 margin-top: -5px; 65 margin-top: -5px;
66} 66}
67 67
68#montage-resizer-handle-se { 68.montage-resizer-handle.se {
69 bottom: -4px; 69 bottom: -4px;
70 right: -4px; 70 right: -4px;
71 cursor: se-resize; 71 cursor: se-resize;
72} 72}
73 73
74#montage-resizer-handle-se:hover { 74.montage-resizer-handle.se:hover {
75 bottom: -5px; 75 bottom: -5px;
76 right: -5px; 76 right: -5px;
77} 77}
78 78
79#montage-resizer-handle-s { 79.montage-resizer-handle.s {
80 bottom: -4px; 80 bottom: -4px;
81 left: 50%; 81 left: 50%;
82 margin-left: -4px; 82 margin-left: -4px;
83 cursor: s-resize; 83 cursor: s-resize;
84} 84}
85 85
86#montage-resizer-handle-s:hover { 86.montage-resizer-handle.s:hover {
87 bottom: -5px; 87 bottom: -5px;
88 margin-left: -5px; 88 margin-left: -5px;
89} 89}
90 90
91#montage-resizer-handle-sw { 91.montage-resizer-handle.sw {
92 bottom: -4px; 92 bottom: -4px;
93 left: -4px; 93 left: -4px;
94 cursor: sw-resize; 94 cursor: sw-resize;
95} 95}
96 96
97#montage-resizer-handle-sw:hover { 97.montage-resizer-handle.sw:hover {
98 bottom: -5px; 98 bottom: -5px;
99 left: -5px; 99 left: -5px;
100} 100}
101 101
102#montage-resizer-handle-w {