Merge branch 'master' into staging

This commit is contained in:
yflory
2017-10-11 16:58:45 +02:00
3 changed files with 15 additions and 11 deletions

View File

@@ -268,9 +268,9 @@ define([
};
var addScrollClass = function () {
var $scroll = $('#cp-app-poll-table-scroll');
var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
var noColumn = $scroll.width() < 100;
if (hasScroll && !noColumn) {
var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
var $countCol = $('tr td:last-child');
if (hasScroll) {
$scroll.addClass('cp-app-poll-table-scrolled');
return;
}