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

Merge pull request #3614 from edx/waheed/fix-simple-problem-editor

Browse Source 
Fixed simple problem editor text showing up in advanced editor
This commit is contained in:
marcotuts
2014-05-06 12:17:37 -04:00
parent 04b35f6a3a b873cfc26d
commit b0781cdd4a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/static/js/views/modals/edit_xblock.js
View File

@@ -136,11 +136,9 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal",
mode = parent.data('mode');
event.preventDefault();
var $cheatsheet = $('.simple-editor-cheatsheet');
if ($cheatsheet.hasClass("shown")) {
$(".CodeMirror").removeAttr("style");
$(".modal-content").removeAttr("style");
$cheatsheet.removeClass('shown');
}
$(".CodeMirror").css({"overflow": "none"});
$(".modal-content").removeAttr("style");
$cheatsheet.removeClass('shown');
this.selectMode(mode);
},

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

@@ -109,7 +109,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
$(".CodeMirror").css({"overflow": "visible"})
$(".modal-content").css({"overflow-y": "visible", "overflow-x": "visible"})
else
$(".CodeMirror").removeAttr("style")
$(".CodeMirror").css({"overflow": "none"})
$(".modal-content").removeAttr("style")
###