diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-06 09:46:44 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-06 09:46:44 +0300 |
| commit | 8ade0988eba83484046e99dce543ba9d7cb0d631 (patch) | |
| tree | 3530ae56aa273ea717b8915a5d0e7e91db317947 | |
| parent | a1c0401cb45e82064a6035c0e04ec5ea1e51b6ba (diff) | |
| parent | c3505d13bdf796e3aed2607d733863781a6c46ed (diff) | |
| download | wekan-8ade0988eba83484046e99dce543ba9d7cb0d631.tar.gz wekan-8ade0988eba83484046e99dce543ba9d7cb0d631.tar.bz2 wekan-8ade0988eba83484046e99dce543ba9d7cb0d631.zip | |
Merge branch 'nztqa-fix-dragboard' into devel
Fix IE 11 Drag Board To Scroll. Thanks to tztqa !
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | client/components/boards/boardBody.js | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f792e85d..1741cbb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ This release adds the following new features: * [Change the way to delete a list (card-like)](https://github.com/wekan/wekan/pull/1050), fixes [missing undo button](https://github.com/wekan/wekan/issues/1023). -Thanks to GitHub users BaobabCoder for contributions. +and fixes the following bugs: + +* [Fix IE 11 drag board to scroll](https://github.com/wekan/wekan/pull/1052). + +Thanks to GitHub users BaobabCoder and nztqa for their contributions. # v0.23 2017-05-21 Wekan release diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 370db13b..b3880c61 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -75,7 +75,7 @@ BlazeComponent.extendComponent({ // the user will legitimately expect to be able to select some text with // his mouse. const noDragInside = ['a', 'input', 'textarea', 'p', '.js-list-header']; - if ($(evt.target).closest(noDragInside.join(',')).length === 0) { + if ($(evt.target).closest(noDragInside.join(',')).length === 0 && $('.lists').prop('clientHeight') > evt.offsetY) { this._isDragging = true; this._lastDragPositionX = evt.clientX; } |