diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/blob/utils.js | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/blob/utils.js')
-rw-r--r-- | app/assets/javascripts/blob/utils.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/blob/utils.js b/app/assets/javascripts/blob/utils.js index 840a3dbe450..a0211c8bb8e 100644 --- a/app/assets/javascripts/blob/utils.js +++ b/app/assets/javascripts/blob/utils.js @@ -1,14 +1,17 @@ import Editor from '~/editor/editor_lite'; -export function initEditorLite({ el, blobPath, blobContent }) { +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, - blobPath, - blobContent, + ...args, }); return editor; |