vendor/assets/javascripts/perfect-scrollbar.js in perfect-scrollbar-rails-0.6.11 vs vendor/assets/javascripts/perfect-scrollbar.js in perfect-scrollbar-rails-0.6.12
- old
+ new
@@ -1,6 +1,6 @@
-/* perfect-scrollbar v0.6.11 */
+/* perfect-scrollbar v0.6.12 */
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
'use strict';
var ps = require('../main');
var psInstances = require('../plugin/instances');
@@ -609,11 +609,11 @@
}
return true;
}
i.event.bind(i.ownerDocument, 'keydown', function (e) {
- if (e.isDefaultPrevented && e.isDefaultPrevented()) {
+ if ((e.isDefaultPrevented && e.isDefaultPrevented()) || e.defaultPrevented) {
return;
}
var focused = dom.matches(i.scrollbarX, ':focus') ||
dom.matches(i.scrollbarY, ':focus');
@@ -757,10 +757,10 @@
return [deltaX, deltaY];
}
function shouldBeConsumedByChild(deltaX, deltaY) {
- var child = element.querySelector('textarea:hover, .ps-child:hover');
+ var child = element.querySelector('textarea:hover, select[multiple]:hover, .ps-child:hover');
if (child) {
if (child.tagName !== 'TEXTAREA' && !window.getComputedStyle(child).overflow.match(/(scroll|auto)/)) {
return false;
}