Mercurial > hg > isophonics-drupal-site
comparison core/modules/quickedit/js/views/EntityToolbarView.es6.js @ 14:1fec387a4317
Update Drupal core to 8.5.2 via Composer
author | Chris Cannam |
---|---|
date | Mon, 23 Apr 2018 09:46:53 +0100 |
parents | 4c8ae668cc8c |
children | 129ea1e6d783 |
comparison
equal
deleted
inserted
replaced
13:5fb285c0d0e3 | 14:1fec387a4317 |
---|---|
228 highlightedField = Drupal.quickedit.app.model.get('highlightedField'); | 228 highlightedField = Drupal.quickedit.app.model.get('highlightedField'); |
229 of = highlightedField && highlightedField.editorView && highlightedField.editorView.getEditedElement(); | 229 of = highlightedField && highlightedField.editorView && highlightedField.editorView.getEditedElement(); |
230 delay = 250; | 230 delay = 250; |
231 break; | 231 break; |
232 | 232 |
233 default: | 233 default: { |
234 var fieldModels = this.model.get('fields').models; | 234 const fieldModels = this.model.get('fields').models; |
235 var topMostPosition = 1000000; | 235 let topMostPosition = 1000000; |
236 var topMostField = null; | 236 let topMostField = null; |
237 // Position against the topmost field. | 237 // Position against the topmost field. |
238 for (let i = 0; i < fieldModels.length; i++) { | 238 for (let i = 0; i < fieldModels.length; i++) { |
239 const pos = fieldModels[i].get('el').getBoundingClientRect().top; | 239 const pos = fieldModels[i].get('el').getBoundingClientRect().top; |
240 if (pos < topMostPosition) { | 240 if (pos < topMostPosition) { |
241 topMostPosition = pos; | 241 topMostPosition = pos; |
243 } | 243 } |
244 } | 244 } |
245 of = topMostField.get('el'); | 245 of = topMostField.get('el'); |
246 delay = 50; | 246 delay = 50; |
247 break; | 247 break; |
248 } | |
248 } | 249 } |
249 // Prepare to check the next possible element to position against. | 250 // Prepare to check the next possible element to position against. |
250 check++; | 251 check++; |
251 } while (!of); | 252 } while (!of); |
252 | 253 |
293 const toolbarHeight = info.element.element.outerHeight(true); | 294 const toolbarHeight = info.element.element.outerHeight(true); |
294 if (suggested.top < fenceTop) { | 295 if (suggested.top < fenceTop) { |
295 suggested.top = fenceTop; | 296 suggested.top = fenceTop; |
296 } | 297 } |
297 else if ((suggested.top + toolbarHeight) > (fenceTop + fenceHeight)) { | 298 else if ((suggested.top + toolbarHeight) > (fenceTop + fenceHeight)) { |
298 suggested.top = fenceTop + fenceHeight - toolbarHeight; | 299 suggested.top = (fenceTop + fenceHeight) - toolbarHeight; |
299 } | 300 } |
300 // Position the toolbar. | 301 // Position the toolbar. |
301 info.element.element.css({ | 302 info.element.element.css({ |
302 left: Math.floor(suggested.left), | 303 left: Math.floor(suggested.left), |
303 top: Math.floor(suggested.top), | 304 top: Math.floor(suggested.top), |