fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parse dublincore
[redakcja.git]
/
redakcja
/
static
/
edumed
/
js
/
edumed.js
diff --git
a/redakcja/static/edumed/js/edumed.js
b/redakcja/static/edumed/js/edumed.js
index
b4912dd
..
f720aca
100644
(file)
--- a/
redakcja/static/edumed/js/edumed.js
+++ b/
redakcja/static/edumed/js/edumed.js
@@
-44,9
+44,7
@@
return $(ev.target).hide();
});
$(".retry", this.element).click(function(ev) {
return $(ev.target).hide();
});
$(".retry", this.element).click(function(ev) {
- $(".correct, .incorrect", _this.element).removeClass("correct incorrect");
- $(ev.target).prev(".check").show();
- return $(ev.target).hide();
+ return _this.retry();
});
$('.solutions', this.element).click(function() {
_this.show_solutions();
});
$('.solutions', this.element).click(function() {
_this.show_solutions();
@@
-57,6
+55,12
@@
});
}
});
}
+ Exercise.prototype.retry = function() {
+ $(".correct, .incorrect", this.element).removeClass("correct incorrect");
+ $(".check", this.element).show();
+ return $(".retry", this.element).hide();
+ };
+
Exercise.prototype.reset = function() {
$(this.element).html($(this.element).data('exercise-html'));
return exercise(this.element);
Exercise.prototype.reset = function() {
$(this.element).html($(this.element).data('exercise-html'));
return exercise(this.element);
@@
-121,7
+125,14
@@
};
Exercise.prototype.show_score = function(score) {
};
Exercise.prototype.show_score = function(score) {
- return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
+ var $msg;
+ $msg = $(".message", this.element);
+ $msg.text("Wynik: " + score[0] + " / " + score[1]);
+ if (score[0] === score[1]) {
+ return $msg.addClass("maxscore");
+ } else {
+ return $msg.removeClass("maxscore");
+ }
};
Exercise.prototype.draggable_equal = function($draggable1, $draggable2) {
};
Exercise.prototype.draggable_equal = function($draggable1, $draggable2) {
@@
-155,8
+166,9
@@
if ($added.is(".add-li")) {
$added.wrap("<li/>");
}
if ($added.is(".add-li")) {
$added.wrap("<li/>");
}
- $added.append('<span class="remove">x</span>');
+ $added.append('<span class="remove">x</span>
<div class="clr"></div>
');
return $('.remove', $added).click(function(ev) {
return $('.remove', $added).click(function(ev) {
+ _this.retry();
if (!ismultiple) {
$($added.data('original')).removeClass('disabled').draggable('enable');
}
if (!ismultiple) {
$($added.data('original')).removeClass('disabled').draggable('enable');
}
@@
-174,7
+186,8
@@
var draggable_opts, self;
draggable_opts = {
revert: 'invalid',
var draggable_opts, self;
draggable_opts = {
revert: 'invalid',
- helper: 'clone'
+ helper: 'clone',
+ start: _this.retry
};
$(".draggable", question).draggable(draggable_opts);
self = _this;
};
$(".draggable", question).draggable(draggable_opts);
self = _this;
@@
-220,6
+233,7
@@
function Wybor(element) {
Wybor.__super__.constructor.call(this, element);
function Wybor(element) {
Wybor.__super__.constructor.call(this, element);
+ $(".question-piece input", element).change(this.retry);
}
Wybor.prototype.check_question = function(question) {
}
Wybor.prototype.check_question = function(question) {
@@
-284,7
+298,8
@@
function Uporzadkuj(element) {
Uporzadkuj.__super__.constructor.call(this, element);
$('ol, ul', this.element).sortable({
function Uporzadkuj(element) {
Uporzadkuj.__super__.constructor.call(this, element);
$('ol, ul', this.element).sortable({
- items: "> li"
+ items: "> li",
+ start: this.retry
});
}
});
}
@@
-478,7
+493,7
@@
_ref = $(".question-piece", this.element);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
_ref = $(".question-piece", this.element);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
- if ($(qp).
data('
solution').split(/[ ,]+/).length > 1) {
+ if ($(qp).
attr('data-
solution').split(/[ ,]+/).length > 1) {
return true;
}
}
return true;
}
}
@@
-501,7
+516,7
@@
count = 0;
all = 0;
if (!minimum) {
count = 0;
all = 0;
if (!minimum) {
- all = $(".subject
s
.question-piece", question).length;
+ all = $(".subject .question-piece", question).length;
}
_ref = $(".predicate [data-predicate]", question);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
}
_ref = $(".predicate [data-predicate]", question);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@
-549,7
+564,7
@@
m = draggables[_j];
$pr = $(".predicate [data-predicate=" + m + "]", question);
$ph = $pr.find(".placeholder:visible");
m = draggables[_j];
$pr = $(".predicate [data-predicate=" + m + "]", question);
$ph = $pr.find(".placeholder:visible");
- _results1.push(this.draggable_move($(qp), $ph, this.multiple));
+ _results1.push(this.draggable_move($(qp), $ph
.eq(0)
, this.multiple));
}
return _results1;
}).call(this));
}
return _results1;
}).call(this));
@@
-566,20
+581,23
@@
__extends(PrawdaFalsz, _super);
function PrawdaFalsz(element) {
__extends(PrawdaFalsz, _super);
function PrawdaFalsz(element) {
- var qp, _i, _len, _ref;
+ var qp, _i, _len, _ref,
+ _this = this;
PrawdaFalsz.__super__.constructor.call(this, element);
_ref = $(".question-piece", this.element);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
$(".true", qp).click(function(ev) {
ev.preventDefault();
PrawdaFalsz.__super__.constructor.call(this, element);
_ref = $(".question-piece", this.element);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
qp = _ref[_i];
$(".true", qp).click(function(ev) {
ev.preventDefault();
- $(this).closest(".question-piece").data("value", "true");
- return $(this).addClass('chosen').siblings('a').removeClass('chosen');
+ _this.retry();
+ $(ev.target).closest(".question-piece").data("value", "true");
+ return $(ev.target).addClass('chosen').siblings('a').removeClass('chosen');
});
$(".false", qp).click(function(ev) {
ev.preventDefault();
});
$(".false", qp).click(function(ev) {
ev.preventDefault();
- $(this).closest(".question-piece").data("value", "false");
- return $(this).addClass('chosen').siblings('a').removeClass('chosen');
+ _this.retry();
+ $(ev.target).closest(".question-piece").data("value", "false");
+ return $(ev.target).addClass('chosen').siblings('a').removeClass('chosen');
});
}
}
});
}
}