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
7b92d52f
Commit
7b92d52f
authored
May 07, 2014
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3510 from edx/waheed/stud1583-toggle-cheatsheet-not-working
Fixed cheatsheet for open ended editor.
parents
ca0315ed
998af82b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
5 deletions
+47
-5
cms/static/js/views/modals/edit_xblock.js
+6
-5
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
+12
-0
common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
+12
-0
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
+17
-0
No files found.
cms/static/js/views/modals/edit_xblock.js
View file @
7b92d52f
...
...
@@ -135,13 +135,14 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal",
var
parent
=
$
(
event
.
target
.
parentElement
),
mode
=
parent
.
data
(
'mode'
);
event
.
preventDefault
();
this
.
selectMode
(
mode
);
var
$cheatsheet
=
$
(
'.simple-editor-cheatsheet'
);
if
(
$cheatsheet
.
hasClass
(
"shown"
))
{
$
(
".CodeMirror"
).
removeAttr
(
"style"
);
$
(
".modal-content"
).
removeAttr
(
"style"
);
$cheatsheet
.
removeClass
(
'shown'
);
if
(
$cheatsheet
.
length
==
0
){
$cheatsheet
=
$
(
'.simple-editor-open-ended-cheatsheet'
);
}
this
.
selectMode
(
mode
);
$
(
".CodeMirror"
).
css
({
"overflow"
:
"none"
});
$
(
".modal-content"
).
removeAttr
(
"style"
);
$cheatsheet
.
removeClass
(
'shown'
);
},
selectMode
:
function
(
mode
)
{
...
...
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
View file @
7b92d52f
...
...
@@ -20,6 +20,18 @@ describe 'OpenEndedMarkdownEditingDescriptor', ->
expect
(
saveResult
.
nullout
).
toEqual
([
'markdown'
])
expect
(
saveResult
.
data
).
toEqual
(
'xml only'
)
describe
'advanced editor opens correctly'
,
->
it
'click on advanced editor should work'
,
->
loadFixtures
'combinedopenended-with-markdown.html'
@
descriptor
=
new
OpenEndedMarkdownEditingDescriptor
(
$
(
'.combinedopenended-editor'
))
spyOn
(
@
descriptor
,
'confirmConversionToXml'
).
andReturn
(
true
)
expect
(
@
descriptor
.
confirmConversionToXml
).
not
.
toHaveBeenCalled
()
e
=
jasmine
.
createSpyObj
(
'e'
,
[
'preventDefault'
])
@
descriptor
.
onShowXMLButton
(
e
)
expect
(
e
.
preventDefault
).
toHaveBeenCalled
()
expect
(
@
descriptor
.
confirmConversionToXml
).
toHaveBeenCalled
()
expect
(
$
(
'.editor-bar'
).
length
).
toEqual
(
0
)
describe
'insertPrompt'
,
->
it
'inserts the template if selection is empty'
,
->
revisedSelection
=
OpenEndedMarkdownEditingDescriptor
.
insertPrompt
(
''
)
...
...
common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
View file @
7b92d52f
...
...
@@ -20,6 +20,18 @@ describe 'MarkdownEditingDescriptor', ->
expect
(
saveResult
.
nullout
).
toEqual
([
'markdown'
])
expect
(
saveResult
.
data
).
toEqual
(
'xml only'
)
describe
'advanced editor opens correctly'
,
->
it
'click on advanced editor should work'
,
->
loadFixtures
'problem-with-markdown.html'
@
descriptor
=
new
MarkdownEditingDescriptor
(
$
(
'.problem-editor'
))
spyOn
(
@
descriptor
,
'confirmConversionToXml'
).
andReturn
(
true
)
expect
(
@
descriptor
.
confirmConversionToXml
).
not
.
toHaveBeenCalled
()
e
=
jasmine
.
createSpyObj
(
'e'
,
[
'preventDefault'
])
@
descriptor
.
onShowXMLButton
(
e
)
expect
(
e
.
preventDefault
).
toHaveBeenCalled
()
expect
(
@
descriptor
.
confirmConversionToXml
).
toHaveBeenCalled
()
expect
(
$
(
'.editor-bar'
).
length
).
toEqual
(
0
)
describe
'insertMultipleChoice'
,
->
it
'inserts the template if selection is empty'
,
->
revisedSelection
=
MarkdownEditingDescriptor
.
insertMultipleChoice
(
''
)
...
...
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View file @
7b92d52f
...
...
@@ -87,6 +87,8 @@ Write a persuasive essay to a newspaper reflecting your views on censorship in l
###
onShowXMLButton
:
(
e
)
=>
e
.
preventDefault
();
if
@
cheatsheet
!=
undefined
@
addRemoveCheatsheetCSS
()
if
@
confirmConversionToXml
()
@
createXMLEditor
(
OpenEndedMarkdownEditingDescriptor
.
markdownToXml
(
@
markdown_editor
.
getValue
()))
# Need to refresh to get line numbers to display properly (and put cursor position to 0)
...
...
@@ -131,8 +133,23 @@ 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
()
setTimeout
(
=>
@
cheatsheet
.
toggleClass
(
'shown'
)),
10
###
Function to add/remove CSS for cheatsheet.
###
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"
)
###
Stores the current editor and hides the one that is not displayed.
###
...
...
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