X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bb26a742696b7b86bb1b555a285ceaa24b5fa3b3..a980dc9ed36f367a04dfdc56e277375d9cca1bd1:/redakcja/static/edumed/js/edumed.js diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js index b4912dd0..a99377de 100644 --- 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) { - $(".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(); @@ -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); @@ -155,8 +159,9 @@ if ($added.is(".add-li")) { $added.wrap("
  • "); } - $added.append('x'); + $added.append('x
    '); return $('.remove', $added).click(function(ev) { + _this.retry(); if (!ismultiple) { $($added.data('original')).removeClass('disabled').draggable('enable'); } @@ -174,7 +179,8 @@ var draggable_opts, self; draggable_opts = { revert: 'invalid', - helper: 'clone' + helper: 'clone', + start: _this.retry }; $(".draggable", question).draggable(draggable_opts); self = _this; @@ -220,6 +226,7 @@ function Wybor(element) { Wybor.__super__.constructor.call(this, element); + $(".question-piece input", element).change(this.retry); } Wybor.prototype.check_question = function(question) { @@ -284,7 +291,8 @@ function Uporzadkuj(element) { Uporzadkuj.__super__.constructor.call(this, element); $('ol, ul', this.element).sortable({ - items: "> li" + items: "> li", + start: this.retry }); } @@ -549,7 +557,7 @@ 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)); @@ -566,20 +574,23 @@ __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(); - $(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(); - $(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'); }); } }