diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-03-23 23:41:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 23:41:03 +0300 |
| commit | a02376ecf678a9c1678bc9083a2aea69d4842f7d (patch) | |
| tree | d702e10a32298736d8356636eade9bf05dc6fde0 /plugins/SegmentEditor | |
| parent | abd9c07913b776fd56402c16622ed81765be8c8b (diff) | |
Fix segment editor scrolling (#15719)
Diffstat (limited to 'plugins/SegmentEditor')
| -rw-r--r-- | plugins/SegmentEditor/javascripts/Segmentation.js | 7 | ||||
| -rw-r--r-- | plugins/SegmentEditor/stylesheets/segmentation.less | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js index 1c5618b049..8b6efbce62 100644 --- a/plugins/SegmentEditor/javascripts/Segmentation.js +++ b/plugins/SegmentEditor/javascripts/Segmentation.js @@ -392,9 +392,6 @@ Segmentation = (function($) { || $(e.target).hasClass("filterNoResults")) { e.stopPropagation(); } else { - if (self.jscroll) { - self.jscroll.destroy(); - } self.target.closest('.segmentEditorPanel').removeClass('expanded'); } } else { @@ -402,10 +399,6 @@ Segmentation = (function($) { closeAllOpenLists(); self.target.closest('.segmentEditorPanel').addClass('expanded'); self.target.find('.segmentFilter').val(self.translations['General_Search']).trigger('keyup'); - self.jscroll = self.target.find(".segmentList").jScrollPane({ - autoReinitialise: true, - showArrows:true - }).data().jsp; } }); diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less index a1a9a0dff6..15f890bde2 100644 --- a/plugins/SegmentEditor/stylesheets/segmentation.less +++ b/plugins/SegmentEditor/stylesheets/segmentation.less @@ -329,7 +329,7 @@ html.comparisonsDisabled .segmentationContainer ul.submenu { max-height: 300px; margin-top: 5px; overflow-x: hidden; - overflow-y: scroll; + overflow-y: auto; } .segmentListContainer { |