Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cheatsheet visibility code refactored.

Browse Source
This commit is contained in:
Waheed Ahmed
2014-05-23 14:46:47 +05:00
parent b2656bb24e
commit 6ad6f77ca2
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View File

@@ -87,8 +87,9 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l
###
onShowXMLButton: (e) =>
e.preventDefault();
if @cheatsheet != undefined
@addRemoveCheatsheetCSS()
if @cheatsheet && @cheatsheet.hasClass('shown')
@cheatsheet.toggleClass('shown')
@toggleCheatsheetVisibility()
if @confirmConversionToXml()
@createXMLEditor(OpenEndedMarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue()))
# Need to refresh to get line numbers to display properly (and put cursor position to 0)
@@ -133,21 +134,16 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l
@cheatsheet = $($('#simple-editor-open-ended-cheatsheet').html())
$(@markdown_editor.getWrapperElement()).append(@cheatsheet)
@addRemoveCheatsheetCSS()
@toggleCheatsheetVisibility()
setTimeout (=> @cheatsheet.toggleClass('shown')), 10
###
Function to add/remove CSS for cheatsheet.
Function to toggle cheatsheet visibility.
###
addRemoveCheatsheetCSS: () =>
if !@cheatsheet.hasClass("shown")
$(".CodeMirror").css({"overflow": "visible"})
$(".modal-content").css({"overflow-y": "visible", "overflow-x": "visible"})
else
$(".CodeMirror").css({"overflow": ""})
$(".modal-content").removeAttr("style")
toggleCheatsheetVisibility: () =>
$('.modal-content').toggleClass('cheatsheet-is-shown')
###

18
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
View File

@@ -48,8 +48,9 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
###
onShowXMLButton: (e) =>
e.preventDefault();
if @cheatsheet != undefined
@addRemoveCheatsheetCSS()
if @cheatsheet && @cheatsheet.hasClass('shown')
@cheatsheet.toggleClass('shown')
@toggleCheatsheetVisibility()
if @confirmConversionToXml()
@createXMLEditor(MarkdownEditingDescriptor.markdownToXml(@markdown_editor.getValue()))
# Need to refresh to get line numbers to display properly (and put cursor position to 0)
@@ -96,21 +97,16 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
@cheatsheet = $($('#simple-editor-cheatsheet').html())
$(@markdown_editor.getWrapperElement()).append(@cheatsheet)
@addRemoveCheatsheetCSS()
@toggleCheatsheetVisibility()
setTimeout (=> @cheatsheet.toggleClass('shown')), 10
###
Function to add/remove CSS for cheatsheet.
Function to toggle cheatsheet visibility.
###
addRemoveCheatsheetCSS: () =>
if !@cheatsheet.hasClass("shown")
$(".CodeMirror").css({"overflow": "visible"})
$(".modal-content").css({"overflow-y": "visible", "overflow-x": "visible"})
else
$(".CodeMirror").css({"overflow": "none"})
$(".modal-content").removeAttr("style")
toggleCheatsheetVisibility: () =>
$('.modal-content').toggleClass('cheatsheet-is-shown')
###
Stores the current editor and hides the one that is not displayed.