diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 18:10:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 18:10:02 +0300 |
| commit | f6a3028be7c20cd509685258ba7e50d9d6a68114 (patch) | |
| tree | 82960188ccaca3f08a3b3e45b33010ad523230cc /app/assets/javascripts/blob | |
| parent | 999f47e9e6da399de9dc1de404f073f7dd30af0d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
| -rw-r--r-- | app/assets/javascripts/blob/utils.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/utils.js b/app/assets/javascripts/blob/utils.js index 052de0cb9d4..a0211c8bb8e 100644 --- a/app/assets/javascripts/blob/utils.js +++ b/app/assets/javascripts/blob/utils.js @@ -4,7 +4,11 @@ export function initEditorLite({ el, ...args }) { if (!el) { throw new Error(`"el" parameter is required to initialize Editor`); } - const editor = new Editor(); + const editor = new Editor({ + scrollbar: { + alwaysConsumeMouseWheel: false, + }, + }); editor.createInstance({ el, ...args, |