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
f7c0fe30
Commit
f7c0fe30
authored
Aug 03, 2012
by
Mike Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added silentSave in edit view so that alert boxes don't pop up
parent
1389f003
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
11 deletions
+21
-11
cms/static/coffee/src/views/module_edit.coffee
+12
-0
cms/templates/widgets/capa-edit.html
+1
-2
common/lib/xmodule/xmodule/capa_module.py
+3
-3
common/lib/xmodule/xmodule/js/src/capa/edit.coffee
+1
-1
common/lib/xmodule/xmodule/js/src/capa/peg-0.7.0.min.js
+0
-0
common/lib/xmodule/xmodule/js/src/capa/xml-validator.js
+4
-5
No files found.
cms/static/coffee/src/views/module_edit.coffee
View file @
f7c0fe30
...
@@ -5,6 +5,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
...
@@ -5,6 +5,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
events
:
events
:
'click .cancel'
:
'cancel'
'click .cancel'
:
'cancel'
'click .module-edit'
:
'editSubmodule'
'click .module-edit'
:
'editSubmodule'
'click .silent-save-update'
:
'silentSave'
'click .save-update'
:
'save'
'click .save-update'
:
'save'
initialize
:
->
initialize
:
->
...
@@ -29,6 +30,17 @@ class CMS.Views.ModuleEdit extends Backbone.View
...
@@ -29,6 +30,17 @@ class CMS.Views.ModuleEdit extends Backbone.View
alert
(
"There was an error saving your changes. Please try again."
)
alert
(
"There was an error saving your changes. Please try again."
)
)
)
silentSave
:
(
event
)
->
event
.
preventDefault
()
@
model
.
save
().
done
((
previews
)
=>
previews_section
=
@
$el
.
find
(
'.previews'
).
empty
()
$
.
each
(
previews
,
(
idx
,
preview
)
=>
preview_wrapper
=
$
(
'<section/>'
,
class
:
'preview'
).
append
preview
previews_section
.
append
preview_wrapper
)
XModule
.
loadModules
(
'display'
)
)
cancel
:
(
event
)
->
cancel
:
(
event
)
->
event
.
preventDefault
()
event
.
preventDefault
()
CMS
.
popView
()
CMS
.
popView
()
...
...
cms/templates/widgets/capa-edit.html
View file @
f7c0fe30
<section
class=
"capa-edit"
>
<section
class=
"capa-edit"
>
<a
class=
"silent-save-update"
/>
<div
class=
"parser-message-box"
style=
"display:none;"
>
Input parsed successfully.
</div>
<div
class=
"parser-message-box"
style=
"display:none;"
>
Input parsed successfully.
</div>
<script
type=
"text/javascript"
src=
"/static/grammars/xml-validator.js"
></script>
<script
type=
"text/javascript"
src=
"/static/grammars/peg-0.7.0.min.js"
></script>
<textarea
name=
""
class=
"edit-box source-box"
rows=
"8"
cols=
"40"
></textarea>
<textarea
name=
""
class=
"edit-box source-box"
rows=
"8"
cols=
"40"
></textarea>
<textarea
name=
""
class=
"edit-box capa-box"
rows=
"8"
cols=
"40"
>
${data}
</textarea>
<textarea
name=
""
class=
"edit-box capa-box"
rows=
"8"
cols=
"40"
>
${data}
</textarea>
</section>
</section>
common/lib/xmodule/xmodule/capa_module.py
View file @
f7c0fe30
...
@@ -75,7 +75,9 @@ class CapaModule(XModule):
...
@@ -75,7 +75,9 @@ class CapaModule(XModule):
js
=
{
'coffee'
:
[
resource_string
(
__name__
,
'js/src/capa/display.coffee'
)],
js
=
{
'coffee'
:
[
resource_string
(
__name__
,
'js/src/capa/display.coffee'
)],
'js'
:
[
resource_string
(
__name__
,
'js/src/capa/imageinput.js'
),
'js'
:
[
resource_string
(
__name__
,
'js/src/capa/imageinput.js'
),
resource_string
(
__name__
,
'js/src/capa/schematic.js'
)]}
resource_string
(
__name__
,
'js/src/capa/schematic.js'
),
resource_string
(
__name__
,
'js/src/capa/peg-0.7.0.min.js'
),
resource_string
(
__name__
,
'js/src/capa/xml-validator.js'
)]}
js_module_name
=
"Problem"
js_module_name
=
"Problem"
css
=
{
'scss'
:
[
resource_string
(
__name__
,
'css/capa/display.scss'
)]}
css
=
{
'scss'
:
[
resource_string
(
__name__
,
'css/capa/display.scss'
)]}
...
@@ -446,8 +448,6 @@ class CapaModule(XModule):
...
@@ -446,8 +448,6 @@ class CapaModule(XModule):
try
:
try
:
old_state
=
self
.
lcp
.
get_state
()
old_state
=
self
.
lcp
.
get_state
()
lcp_id
=
self
.
lcp
.
problem_id
lcp_id
=
self
.
lcp
.
problem_id
import
pdb
pdb
.
set_trace
()
correct_map
=
self
.
lcp
.
grade_answers
(
answers
)
correct_map
=
self
.
lcp
.
grade_answers
(
answers
)
except
StudentInputError
as
inst
:
except
StudentInputError
as
inst
:
# TODO (vshnayder): why is this line here?
# TODO (vshnayder): why is this line here?
...
...
common/lib/xmodule/xmodule/js/src/capa/edit.coffee
View file @
f7c0fe30
...
@@ -33,7 +33,7 @@ class @CapaDescriptor
...
@@ -33,7 +33,7 @@ class @CapaDescriptor
@
auto_save_timer
=
window
.
setTimeout
(
callback
,
1000
)
@
auto_save_timer
=
window
.
setTimeout
(
callback
,
1000
)
autoSave
:
(
event
)
->
autoSave
:
(
event
)
->
$
(
".save-update"
).
click
();
$
(
".s
ilent-s
ave-update"
).
click
();
parse
:
->
parse
:
->
try
try
...
...
c
ms/static/grammars
/peg-0.7.0.min.js
→
c
ommon/lib/xmodule/xmodule/js/src/capa
/peg-0.7.0.min.js
View file @
f7c0fe30
File moved
c
ms/static/grammars
/xml-validator.js
→
c
ommon/lib/xmodule/xmodule/js/src/capa
/xml-validator.js
View file @
f7c0fe30
...
@@ -42,10 +42,9 @@ function validateXML(txt) {
...
@@ -42,10 +42,9 @@ function validateXML(txt) {
if
(
xmlDoc
.
parseError
.
errorCode
!=
0
)
{
if
(
xmlDoc
.
parseError
.
errorCode
!=
0
)
{
txt
=
"Error Code: "
+
xmlDoc
.
parseError
.
errorCode
+
"
\
n"
;
txt
=
"Error Code: "
+
xmlDoc
.
parseError
.
errorCode
+
"
\
n"
;
txt
=
txt
+
"Error Reason: "
+
xmlDoc
.
parseError
.
reason
;
txt
=
txt
+
"Error Reason: "
+
xmlDoc
.
parseError
.
reason
;
txt
=
txt
+
"Error Line: "
+
xmlDoc
.
parseError
.
line
;
return
txt
;
return
false
;
}
else
{
}
else
{
return
true
;
return
xmlDoc
;
}
}
}
}
// code for Mozilla, Firefox, Opera, etc.
// code for Mozilla, Firefox, Opera, etc.
...
@@ -55,9 +54,9 @@ function validateXML(txt) {
...
@@ -55,9 +54,9 @@ function validateXML(txt) {
if
(
xmlDoc
.
getElementsByTagName
(
"parsererror"
).
length
>
0
)
{
if
(
xmlDoc
.
getElementsByTagName
(
"parsererror"
).
length
>
0
)
{
checkErrorXML
(
xmlDoc
.
getElementsByTagName
(
"parsererror"
)[
0
]);
checkErrorXML
(
xmlDoc
.
getElementsByTagName
(
"parsererror"
)[
0
]);
return
false
;
return
xt
;
}
else
{
}
else
{
return
true
;
return
xmlDoc
;
}
}
}
else
{
}
else
{
}
}
...
...
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