Fixed a bug when CMS would incorrectly highlight plugin content

vxsx · vxsx · commit 65a3127894d3 · 2018-02-19T12:32:33.000+01:00
Invisible elements were reporting 0/0 offset which would essentially
scroll the page higher and higher every time you press shift while
hovering over plugin that has invisible elements
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -4,6 +4,8 @@
   with multiple page types per site.
 * Fixed a bug which prevented toolbar js from working correctly when rendered
   before toolbar.
+* Fixed a bug where CMS would incorrectly highlight plugin content when plugin
+  contains invisible elements
 
 
 === 3.5.0 (2018-01-31) ===
diff --git a/cms/static/cms/js/dist/3.5.0/bundle.toolbar.min.js b/cms/static/cms/js/dist/3.5.0/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.plugins.js b/cms/static/cms/js/modules/cms.plugins.js
@@ -2076,6 +2076,12 @@ Plugin._highlightPluginContent = function _highlightPluginContent(
         var mr = parseInt(el.css('margin-right'), 10);
         var mt = parseInt(el.css('margin-top'), 10);
         var mb = parseInt(el.css('margin-bottom'), 10);
+        var width = el.outerWidth();
+        var height = el.outerHeight();
+
+        if (width === 0 && height === 0) {
+            return;
+        }
 
         if (isNaN(ml)) {
             ml = 0;
@@ -2092,12 +2098,16 @@ Plugin._highlightPluginContent = function _highlightPluginContent(
 
         positions.push({
             x1: offset.left - ml,
-            x2: offset.left + el.outerWidth() + mr,
+            x2: offset.left + width + mr,
             y1: offset.top - mt,
-            y2: offset.top + el.outerHeight() + mb
+            y2: offset.top + height + mb
         });
     });
 
+    if (positions.length === 0) {
+        return;
+    }
+
     // turns out that offset calculation will be off by toolbar height if
     // position is set to "relative" on html element.
     var html = $('html');
