Commit 05d9d139 by Waheed Ahmed

Fixed CodeMirror editor view height in studio.

TNL-920
parent 1e051e5e
...@@ -222,6 +222,10 @@ ...@@ -222,6 +222,10 @@
height: 365px; height: 365px;
} }
.CodeMirror-advanced {
height: 435px;
}
.wrapper-comp-settings { .wrapper-comp-settings {
.list-input { .list-input {
......
...@@ -80,6 +80,9 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l ...@@ -80,6 +80,9 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l
if text if text
@xml_editor.setValue(text) @xml_editor.setValue(text)
@setCurrentEditor(@xml_editor) @setCurrentEditor(@xml_editor)
$(@xml_editor.getWrapperElement()).toggleClass("CodeMirror-advanced");
# Need to refresh to get line numbers to display properly.
@xml_editor.refresh()
### ###
User has clicked to show the XML editor. Before XML editor is swapped in, User has clicked to show the XML editor. Before XML editor is swapped in,
...@@ -92,9 +95,8 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l ...@@ -92,9 +95,8 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l
@toggleCheatsheetVisibility() @toggleCheatsheetVisibility()
if @confirmConversionToXml() if @confirmConversionToXml()
@createXMLEditor(OpenEndedMarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue())) @createXMLEditor(OpenEndedMarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue()))
# Need to refresh to get line numbers to display properly (and put cursor position to 0) # Put cursor position to 0.
@xml_editor.setCursor(0) @xml_editor.setCursor(0)
@xml_editor.refresh()
# Hide markdown-specific toolbar buttons # Hide markdown-specific toolbar buttons
$(@element.find('.editor-bar')).hide() $(@element.find('.editor-bar')).hide()
......
...@@ -41,6 +41,9 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ...@@ -41,6 +41,9 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
if text if text
@xml_editor.setValue(text) @xml_editor.setValue(text)
@setCurrentEditor(@xml_editor) @setCurrentEditor(@xml_editor)
$(@xml_editor.getWrapperElement()).toggleClass("CodeMirror-advanced");
# Need to refresh to get line numbers to display properly.
@xml_editor.refresh()
### ###
User has clicked to show the XML editor. Before XML editor is swapped in, User has clicked to show the XML editor. Before XML editor is swapped in,
...@@ -53,9 +56,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ...@@ -53,9 +56,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
@toggleCheatsheetVisibility() @toggleCheatsheetVisibility()
if @confirmConversionToXml() if @confirmConversionToXml()
@createXMLEditor(MarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue())) @createXMLEditor(MarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue()))
# Need to refresh to get line numbers to display properly (and put cursor position to 0) # Put cursor position to 0.
@xml_editor.setCursor(0) @xml_editor.setCursor(0)
@xml_editor.refresh()
# Hide markdown-specific toolbar buttons # Hide markdown-specific toolbar buttons
$(@element.find('.editor-bar')).hide() $(@element.find('.editor-bar')).hide()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment