fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exercises styling, script from upstream
[edumed.git]
/
catalogue
/
static
/
catalogue
/
js
/
edumed.js
diff --git
a/catalogue/static/catalogue/js/edumed.js
b/catalogue/static/catalogue/js/edumed.js
index
f11ac36
..
33b7c58
100644
(file)
--- a/
catalogue/static/catalogue/js/edumed.js
+++ b/
catalogue/static/catalogue/js/edumed.js
@@
-152,12
+152,18
@@
if (!$placeholder.hasClass('multiple')) {
$placeholder.hide();
}
if (!$placeholder.hasClass('multiple')) {
$placeholder.hide();
}
- $added.append('<span class="remove">x</span><div class="clr">');
+ if ($added.is(".add-li")) {
+ $added.wrap("<li/>");
+ }
+ $added.append('<span class="remove">x</span><div class="clr"></div>');
return $('.remove', $added).click(function(ev) {
return $('.remove', $added).click(function(ev) {
- $added.prev(".placeholder:not(.multiple)").show();
if (!ismultiple) {
$($added.data('original')).removeClass('disabled').draggable('enable');
}
if (!ismultiple) {
$($added.data('original')).removeClass('disabled').draggable('enable');
}
+ if ($added.is(".add-li")) {
+ $added = $added.closest('li');
+ }
+ $added.prev(".placeholder:not(.multiple)").show();
return $added.remove();
});
};
return $added.remove();
});
};
@@
-263,7
+269,7
@@
should_be_checked = solution.indexOf(piece_no) >= 0;
}
console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked);
should_be_checked = solution.indexOf(piece_no) >= 0;
}
console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked);
- return $("input[type=checkbox]", qpiece).prop('checked', should_be_checked);
+ return $("input[type=checkbox]
,input[type=radio]
", qpiece).prop('checked', should_be_checked);
});
};
});
};
@@
-598,12
+604,12
@@
PrawdaFalsz.prototype.show_solutions = function() {
var qp, _i, _len, _ref, _results;
PrawdaFalsz.prototype.show_solutions = function() {
var qp, _i, _len, _ref, _results;
- reset();
+
this.
reset();
_ref = $(".question-piece", this.element);
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
_ref = $(".question-piece", this.element);
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
- if ($(qp).data('solution') ===
'true'
) {
+ if ($(qp).data('solution') ===
true
) {
_results.push($(".true", qp).click());
} else {
_results.push($(".false", qp).click());
_results.push($(".true", qp).click());
} else {
_results.push($(".false", qp).click());