deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-05-17 21:16:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #244 from MaksimShakavin/master

Browse source 
Change window.scrollY to window.pageYOffset for IE
This commit is contained in:
Josh Johnson 2017-09-06 08:41:00 +01:00 committed by GitHub
parent 2c4a74496a 671a696962
commit 79638ae88d
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/scripts/dist/choices.js vendored
View file

@ -196,7 +196,7 @@ return /******/ (function(modules) { // webpackBootstrap
};
// Merge options with user options
this.config = (0, _utils.extend)(defaultConfig, userConfig);
this.config = (0, _utils.extend)(defaultConfig, Choices.userDefaults, userConfig);
if (this.config.renderSelectedChoices !== 'auto' && this.config.renderSelectedChoices !== 'always') {
if (!this.config.silent) {
@ -882,7 +882,7 @@ return /******/ (function(modules) { // webpackBootstrap
this.dropdown.setAttribute('aria-expanded', 'true');
var dimensions = this.dropdown.getBoundingClientRect();
var dropdownPos = Math.ceil(dimensions.top + window.scrollY + this.dropdown.offsetHeight);
var dropdownPos = Math.ceil(dimensions.top + window.pageYOffset + this.dropdown.offsetHeight);
// If flip is enabled and the dropdown bottom position is
// greater than the window height flip the dropdown.
@ -2859,7 +2859,9 @@ return /******/ (function(modules) { // webpackBootstrap
return Choices;
}();
module.exports = Choices;
Choices.userDefaults = {};
module.exports = Choices;
/***/ }),
/* 2 */

2
assets/scripts/dist/choices.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
assets/scripts/dist/choices.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
assets/scripts/src/choices.js
View file

@ -759,7 +759,7 @@ class Choices {
this.dropdown.setAttribute('aria-expanded', 'true');
const dimensions = this.dropdown.getBoundingClientRect();
const dropdownPos = Math.ceil(dimensions.top + window.scrollY + this.dropdown.offsetHeight);
const dropdownPos = Math.ceil(dimensions.top + window.pageYOffset + this.dropdown.offsetHeight);
// If flip is enabled and the dropdown bottom position is
// greater than the window height flip the dropdown.