diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-23 21:11:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-23 21:11:55 +0300 |
commit | 0eb05ee0ea5d4e88a1cae604f7ff92507f16d4b0 (patch) | |
tree | d63a079b11cb16c6a196de48858e299ffbabd12d /app/assets/javascripts/editor | |
parent | e01e71a98f4c2d3492d99993d67e7277a2ead698 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/editor')
-rw-r--r-- | app/assets/javascripts/editor/extensions/source_editor_webide_ext.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/editor/utils.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js index bacc05af3f1..6270517b3f3 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js @@ -60,7 +60,7 @@ const renderSideBySide = (domElement) => { const updateDiffInstanceRendering = (instance) => { instance.updateOptions({ - renderSideBySide: renderSideBySide(instance.getContainerDomNode()), + renderSideBySide: renderSideBySide(instance.getDomNode()), }); }; diff --git a/app/assets/javascripts/editor/utils.js b/app/assets/javascripts/editor/utils.js index cb38ccf0043..df9d3f2b9fb 100644 --- a/app/assets/javascripts/editor/utils.js +++ b/app/assets/javascripts/editor/utils.js @@ -26,7 +26,7 @@ export const getBlobLanguage = (blobPath) => { const ext = `.${blobPath.split('.').pop()}`; const language = monacoLanguages .getLanguages() - .find((lang) => lang.extensions?.indexOf(ext) >= 0); + .find((lang) => lang.extensions.indexOf(ext) !== -1); return language ? language.id : defaultLanguage; }; |