|
6 | 6 | import '@vaadin/button/src/vaadin-button.js'; |
7 | 7 | import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js'; |
8 | 8 | import '@vaadin/text-field/src/vaadin-text-field.js'; |
| 9 | +import '@vaadin/tooltip/src/vaadin-tooltip.js'; |
9 | 10 | import '../vendor/vaadin-quill.js'; |
10 | 11 | import './vaadin-rich-text-editor-toolbar-styles.js'; |
11 | 12 | import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; |
@@ -156,166 +157,168 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) { |
156 | 157 | <div part="toolbar"> |
157 | 158 | <span part="toolbar-group toolbar-group-history"> |
158 | 159 | <!-- Undo and Redo --> |
159 | | - <button |
160 | | - type="button" |
161 | | - part="toolbar-button toolbar-button-undo" |
162 | | - on-click="_undo" |
163 | | - title$="[[i18n.undo]]" |
164 | | - ></button> |
165 | | - <button |
166 | | - type="button" |
167 | | - part="toolbar-button toolbar-button-redo" |
168 | | - on-click="_redo" |
169 | | - title$="[[i18n.redo]]" |
170 | | - ></button> |
| 160 | + <button id="btn-undo" type="button" part="toolbar-button toolbar-button-undo" on-click="_undo"></button> |
| 161 | + <vaadin-tooltip for="btn-undo" text="[[i18n.undo]]"></vaadin-tooltip> |
| 162 | +
|
| 163 | + <button id="btn-redo" type="button" part="toolbar-button toolbar-button-redo" on-click="_redo"></button> |
| 164 | + <vaadin-tooltip for="btn-redo" text="[[i18n.redo]]"></vaadin-tooltip> |
171 | 165 | </span> |
172 | 166 |
|
173 | 167 | <span part="toolbar-group toolbar-group-emphasis"> |
174 | 168 | <!-- Bold --> |
175 | | - <button class="ql-bold" part="toolbar-button toolbar-button-bold" title$="[[i18n.bold]]"></button> |
| 169 | + <button id="btn-bold" class="ql-bold" part="toolbar-button toolbar-button-bold"></button> |
| 170 | + <vaadin-tooltip for="btn-bold" text="[[i18n.bold]]"></vaadin-tooltip> |
176 | 171 |
|
177 | 172 | <!-- Italic --> |
178 | | - <button class="ql-italic" part="toolbar-button toolbar-button-italic" title$="[[i18n.italic]]"></button> |
| 173 | + <button id="btn-italic" class="ql-italic" part="toolbar-button toolbar-button-italic"></button> |
| 174 | + <vaadin-tooltip for="btn-italic" text="[[i18n.italic]]"></vaadin-tooltip> |
179 | 175 |
|
180 | 176 | <!-- Underline --> |
181 | | - <button |
182 | | - class="ql-underline" |
183 | | - part="toolbar-button toolbar-button-underline" |
184 | | - title$="[[i18n.underline]]" |
185 | | - ></button> |
| 177 | + <button id="btn-underline" class="ql-underline" part="toolbar-button toolbar-button-underline"></button> |
| 178 | + <vaadin-tooltip for="btn-underline" text="[[i18n.underline]]"></vaadin-tooltip> |
186 | 179 |
|
187 | 180 | <!-- Strike --> |
188 | | - <button class="ql-strike" part="toolbar-button toolbar-button-strike" title$="[[i18n.strike]]"></button> |
| 181 | + <button id="btn-strike" class="ql-strike" part="toolbar-button toolbar-button-strike"></button> |
| 182 | + <vaadin-tooltip for="btn-strike" text="[[i18n.strike]]"></vaadin-tooltip> |
189 | 183 | </span> |
190 | 184 |
|
191 | 185 | <span part="toolbar-group toolbar-group-heading"> |
192 | 186 | <!-- Header buttons --> |
193 | 187 | <button |
| 188 | + id="btn-h1" |
194 | 189 | type="button" |
195 | 190 | class="ql-header" |
196 | 191 | value="1" |
197 | 192 | part="toolbar-button toolbar-button-h1" |
198 | | - title$="[[i18n.h1]]" |
199 | 193 | ></button> |
| 194 | + <vaadin-tooltip for="btn-h1" text="[[i18n.h1]]"></vaadin-tooltip> |
200 | 195 | <button |
| 196 | + id="btn-h2" |
201 | 197 | type="button" |
202 | 198 | class="ql-header" |
203 | 199 | value="2" |
204 | 200 | part="toolbar-button toolbar-button-h2" |
205 | | - title$="[[i18n.h2]]" |
206 | 201 | ></button> |
| 202 | + <vaadin-tooltip for="btn-h2" text="[[i18n.h2]]"></vaadin-tooltip> |
207 | 203 | <button |
| 204 | + id="btn-h3" |
208 | 205 | type="button" |
209 | 206 | class="ql-header" |
210 | 207 | value="3" |
211 | 208 | part="toolbar-button toolbar-button-h3" |
212 | | - title$="[[i18n.h3]]" |
213 | 209 | ></button> |
| 210 | + <vaadin-tooltip for="btn-h3" text="[[i18n.h3]]"></vaadin-tooltip> |
214 | 211 | </span> |
215 | 212 |
|
216 | 213 | <span part="toolbar-group toolbar-group-glyph-transformation"> |
217 | 214 | <!-- Subscript and superscript --> |
218 | 215 | <button |
| 216 | + id="btn-subscript" |
219 | 217 | class="ql-script" |
220 | 218 | value="sub" |
221 | 219 | part="toolbar-button toolbar-button-subscript" |
222 | | - title$="[[i18n.subscript]]" |
223 | 220 | ></button> |
| 221 | + <vaadin-tooltip for="btn-subscript" text="[[i18n.subscript]]"></vaadin-tooltip> |
224 | 222 | <button |
| 223 | + id="btn-superscript" |
225 | 224 | class="ql-script" |
226 | 225 | value="super" |
227 | 226 | part="toolbar-button toolbar-button-superscript" |
228 | | - title$="[[i18n.superscript]]" |
229 | 227 | ></button> |
| 228 | + <vaadin-tooltip for="btn-superscript" text="[[i18n.superscript]]"></vaadin-tooltip> |
230 | 229 | </span> |
231 | 230 |
|
232 | 231 | <span part="toolbar-group toolbar-group-list"> |
233 | 232 | <!-- List buttons --> |
234 | 233 | <button |
| 234 | + id="btn-ol" |
235 | 235 | type="button" |
236 | 236 | class="ql-list" |
237 | 237 | value="ordered" |
238 | 238 | part="toolbar-button toolbar-button-list-ordered" |
239 | | - title$="[[i18n.listOrdered]]" |
240 | 239 | ></button> |
| 240 | + <vaadin-tooltip for="btn-ol" text="[[i18n.listOrdered]]"></vaadin-tooltip> |
241 | 241 | <button |
| 242 | + id="btn-ul" |
242 | 243 | type="button" |
243 | 244 | class="ql-list" |
244 | 245 | value="bullet" |
245 | 246 | part="toolbar-button toolbar-button-list-bullet" |
246 | | - title$="[[i18n.listBullet]]" |
247 | 247 | ></button> |
| 248 | + <vaadin-tooltip for="btn-ul" text="[[i18n.listBullet]]"></vaadin-tooltip> |
248 | 249 | </span> |
249 | 250 |
|
250 | 251 | <span part="toolbar-group toolbar-group-alignment"> |
251 | 252 | <!-- Align buttons --> |
252 | 253 | <button |
| 254 | + id="btn-left" |
253 | 255 | type="button" |
254 | 256 | class="ql-align" |
255 | 257 | value="" |
256 | 258 | part="toolbar-button toolbar-button-align-left" |
257 | | - title$="[[i18n.alignLeft]]" |
258 | 259 | ></button> |
| 260 | + <vaadin-tooltip for="btn-left" text="[[i18n.alignLeft]]"></vaadin-tooltip> |
259 | 261 | <button |
| 262 | + id="btn-center" |
260 | 263 | type="button" |
261 | 264 | class="ql-align" |
262 | 265 | value="center" |
263 | 266 | part="toolbar-button toolbar-button-align-center" |
264 | | - title$="[[i18n.alignCenter]]" |
265 | 267 | ></button> |
| 268 | + <vaadin-tooltip for="btn-center" text="[[i18n.alignCenter]]"></vaadin-tooltip> |
266 | 269 | <button |
| 270 | + id="btn-right" |
267 | 271 | type="button" |
268 | 272 | class="ql-align" |
269 | 273 | value="right" |
270 | 274 | part="toolbar-button toolbar-button-align-right" |
271 | | - title$="[[i18n.alignRight]]" |
272 | 275 | ></button> |
| 276 | + <vaadin-tooltip for="btn-right" text="[[i18n.alignRight]]"></vaadin-tooltip> |
273 | 277 | </span> |
274 | 278 |
|
275 | 279 | <span part="toolbar-group toolbar-group-rich-text"> |
276 | 280 | <!-- Image --> |
277 | 281 | <button |
| 282 | + id="btn-image" |
278 | 283 | type="button" |
279 | 284 | part="toolbar-button toolbar-button-image" |
280 | | - title$="[[i18n.image]]" |
281 | 285 | on-touchend="_onImageTouchEnd" |
282 | 286 | on-click="_onImageClick" |
283 | 287 | ></button> |
| 288 | + <vaadin-tooltip for="btn-image" text="[[i18n.image]]"></vaadin-tooltip> |
284 | 289 | <!-- Link --> |
285 | 290 | <button |
| 291 | + id="btn-link" |
286 | 292 | type="button" |
287 | 293 | part="toolbar-button toolbar-button-link" |
288 | | - title$="[[i18n.link]]" |
289 | 294 | on-click="_onLinkClick" |
290 | 295 | ></button> |
| 296 | + <vaadin-tooltip for="btn-link" text="[[i18n.link]]"></vaadin-tooltip> |
291 | 297 | </span> |
292 | 298 |
|
293 | 299 | <span part="toolbar-group toolbar-group-block"> |
294 | 300 | <!-- Blockquote --> |
295 | 301 | <button |
| 302 | + id="btn-blockquote" |
296 | 303 | type="button" |
297 | 304 | class="ql-blockquote" |
298 | 305 | part="toolbar-button toolbar-button-blockquote" |
299 | | - title$="[[i18n.blockquote]]" |
300 | 306 | ></button> |
301 | | -
|
| 307 | + <vaadin-tooltip for="btn-blockquote" text="[[i18n.blockquote]]"></vaadin-tooltip> |
302 | 308 | <!-- Code block --> |
303 | 309 | <button |
| 310 | + id="btn-code" |
304 | 311 | type="button" |
305 | 312 | class="ql-code-block" |
306 | 313 | part="toolbar-button toolbar-button-code-block" |
307 | | - title$="[[i18n.codeBlock]]" |
308 | 314 | ></button> |
| 315 | + <vaadin-tooltip for="btn-code" text="[[i18n.codeBlock]]"></vaadin-tooltip> |
309 | 316 | </span> |
310 | 317 |
|
311 | 318 | <span part="toolbar-group toolbar-group-format"> |
312 | 319 | <!-- Clean --> |
313 | | - <button |
314 | | - type="button" |
315 | | - class="ql-clean" |
316 | | - part="toolbar-button toolbar-button-clean" |
317 | | - title$="[[i18n.clean]]" |
318 | | - ></button> |
| 320 | + <button id="btn-clean" type="button" class="ql-clean" part="toolbar-button toolbar-button-clean"></button> |
| 321 | + <vaadin-tooltip for="btn-clean" text="[[i18n.clean]]"></vaadin-tooltip> |
319 | 322 | </span> |
320 | 323 |
|
321 | 324 | <input |
@@ -940,7 +943,10 @@ class RichTextEditor extends ElementMixin(ThemableMixin(PolymerElement)) { |
940 | 943 | timeOut.after(timeout), |
941 | 944 | () => { |
942 | 945 | const formatting = Array.from(this.shadowRoot.querySelectorAll('[part="toolbar"] .ql-active')) |
943 | | - .map((button) => button.getAttribute('title')) |
| 946 | + .map((button) => { |
| 947 | + const tooltip = this.shadowRoot.querySelector(`[for="${button.id}"]`); |
| 948 | + return tooltip.text; |
| 949 | + }) |
944 | 950 | .join(', '); |
945 | 951 | announcer.textContent = formatting; |
946 | 952 | }, |
|
0 commit comments