External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3592 from keithjgrant/code-mirror-fixes

Browse Source 
Code Mirror: prevent console errors when CM parses invalid syntax

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-04-03 18:57:54 +00:00
committed by GitHub
parent c9bac0b51c 95f5315fa3
commit 2bda81661e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.directive.js
View File

@@ -17,10 +17,12 @@ function atCodeMirrorModalController (
} else if ($scope.disabled === 'false') { } else if ($scope.disabled === 'false') {
$scope.disabled = false; $scope.disabled = false;
} }
const editor = $(`${CodeMirrorModalID} .CodeMirror`)[0].CodeMirror; const editor = $(`${CodeMirrorModalID} .CodeMirror`)[0];
const height = $(ModalHeight).height() - $(ModalHeader).height() - if (editor) {
$(ModalFooter).height() - 100; const height = $(ModalHeight).height() - $(ModalHeader).height() -
editor.setSize('100%', height); $(ModalFooter).height() - 100;
editor.CodeMirror.setSize('100%', height);
}
} }
function toggle () { function toggle () {