Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / quickedit / js / views / EntityToolbarView.es6.js

diff --git a/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js b/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js
index 4c87d087e414dcd63442f370566016f9cc92c757..9975ff353569da83c387c3306c94266f84f32433 100644 (file)
--- a/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js
+++ b/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js
@@ -230,10 +230,10 @@
             delay = 250;
             break;
 
-          default:
-            var fieldModels = this.model.get('fields').models;
-            var topMostPosition = 1000000;
-            var topMostField = null;
+          default: {
+            const fieldModels = this.model.get('fields').models;
+            let topMostPosition = 1000000;
+            let topMostField = null;
             // Position against the topmost field.
             for (let i = 0; i < fieldModels.length; i++) {
               const pos = fieldModels[i].get('el').getBoundingClientRect().top;
@@ -245,6 +245,7 @@
             of = topMostField.get('el');
             delay = 50;
             break;
+          }
         }
         // Prepare to check the next possible element to position against.
         check++;
@@ -295,7 +296,7 @@
           suggested.top = fenceTop;
         }
         else if ((suggested.top + toolbarHeight) > (fenceTop + fenceHeight)) {
-          suggested.top = fenceTop + fenceHeight - toolbarHeight;
+          suggested.top = (fenceTop + fenceHeight) - toolbarHeight;
         }
         // Position the toolbar.
         info.element.element.css({