Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
05d9d139
Commit
05d9d139
authored
Dec 24, 2014
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed CodeMirror editor view height in studio.
TNL-920
parent
1e051e5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
cms/static/sass/elements/_modal-window.scss
+4
-0
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
+4
-2
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
+4
-2
No files found.
cms/static/sass/elements/_modal-window.scss
View file @
05d9d139
...
@@ -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
{
...
...
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View file @
05d9d139
...
@@ -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
()
...
...
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
View file @
05d9d139
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment