From 2ffe6032bf8377c310b3b548f9444511765b7bfa Mon Sep 17 00:00:00 2001 From: Waheed Ahmed Date: Tue, 9 Dec 2014 16:22:57 +0500 Subject: [PATCH] Fixed CodeMirror editor view height in studio. TNL-920 --- cms/static/sass/elements/_modal-window.scss | 4 ++++ .../lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee | 2 ++ common/lib/xmodule/xmodule/js/src/problem/edit.coffee | 2 ++ 3 files changed, 8 insertions(+) diff --git a/cms/static/sass/elements/_modal-window.scss b/cms/static/sass/elements/_modal-window.scss index c80ff86862..5bcf7c020d 100644 --- a/cms/static/sass/elements/_modal-window.scss +++ b/cms/static/sass/elements/_modal-window.scss @@ -222,6 +222,10 @@ height: 365px; } + .CodeMirror-advanced { + height: 435px; + } + .wrapper-comp-settings { .list-input { diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee index 9fa40cb999..c5fdc69449 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee @@ -62,6 +62,7 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l $(@element.find('.xml-box')).hide() else @createXMLEditor() + @xml_editor.display.wrapper.className += " CodeMirror-advanced"; @alertTaskRubricModification() @@ -92,6 +93,7 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l @toggleCheatsheetVisibility() if @confirmConversionToXml() @createXMLEditor(OpenEndedMarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue())) + @xml_editor.display.wrapper.className += " CodeMirror-advanced"; # Need to refresh to get line numbers to display properly (and put cursor position to 0) @xml_editor.setCursor(0) @xml_editor.refresh() diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee index 1885e7515a..c0895f2750 100644 --- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee @@ -25,6 +25,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor $(@element.find('.xml-box')).hide() else @createXMLEditor() + @xml_editor.display.wrapper.className += " CodeMirror-advanced"; ### Creates the XML Editor and sets it as the current editor. If text is passed in, @@ -53,6 +54,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor @toggleCheatsheetVisibility() if @confirmConversionToXml() @createXMLEditor(MarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue())) + @xml_editor.display.wrapper.className += " CodeMirror-advanced"; # Need to refresh to get line numbers to display properly (and put cursor position to 0) @xml_editor.setCursor(0) @xml_editor.refresh()