Fix: Editing nodes with XNodeAttributes might lead to data corruption

[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 42f0c37..3262cac 100644 (file)
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.3.3

 (function() {
 (function() {

-  var $, Binding, EduModule, Excercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, excercise,
+  var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,

     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 


@@ -30,54 +30,67 @@
 
   })(Binding);
 
 
   })(Binding);
 

-  Excercise = (function(_super) {
+  Exercise = (function(_super) {

 
 

-    __extends(Excercise, _super);
+    __extends(Exercise, _super);

 
 

-    function Excercise(element) {
+    function Exercise(element) {

       var _this = this;
       var _this = this;

-      Excercise.__super__.constructor.call(this, 'excercise', element);
-      $(this.element).data("excercise-html", $(this.element).html());
-      $(".check", this.element).click(function() {
-        return _this.check();
+      Exercise.__super__.constructor.call(this, 'exercise', element);
+      $(this.element).data("exercise-html", $(this.element).html());
+      $(".check", this.element).click(function(ev) {
+        _this.check();
+        $(".retry", _this.element).show();
+        return $(".check", _this.element).hide();
+      });
+      $(".retry", this.element).click(function(ev) {
+        return _this.retry();

       });
       $('.solutions', this.element).click(function() {
       });
       $('.solutions', this.element).click(function() {

-        return _this.show_solutions();
+        _this.show_solutions();
+        return $(".comment", _this.element).show();

       });
       $('.reset', this.element).click(function() {
         return _this.reset();
       });
     }
 
       });
       $('.reset', this.element).click(function() {
         return _this.reset();
       });
     }
 

-    Excercise.prototype.reset = function() {
-      $(this.element).html($(this.element).data('excercise-html'));
-      return excercise(this.element);
+    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);

     };
 
     };
 

-    Excercise.prototype.piece_correct = function(qpiece) {
+    Exercise.prototype.piece_correct = function(qpiece) {

       return $(qpiece).removeClass('incorrect').addClass('correct');
     };
 
       return $(qpiece).removeClass('incorrect').addClass('correct');
     };
 

-    Excercise.prototype.piece_incorrect = function(qpiece) {
+    Exercise.prototype.piece_incorrect = function(qpiece) {

       return $(qpiece).removeClass('correct').addClass('incorrect');
     };
 
       return $(qpiece).removeClass('correct').addClass('incorrect');
     };
 

-    Excercise.prototype.check = function() {
+    Exercise.prototype.check = function() {

       var score, scores,
         _this = this;
       scores = [];
       $(".question", this.element).each(function(i, question) {
         return scores.push(_this.check_question(question));
       });
       var score, scores,
         _this = this;
       scores = [];
       $(".question", this.element).each(function(i, question) {
         return scores.push(_this.check_question(question));
       });

-      score = [0, 0];
+      score = [0, 0, 0];

       $.each(scores, function(i, s) {
         score[0] += s[0];
       $.each(scores, function(i, s) {
         score[0] += s[0];

-        return score[1] += s[1];
+        score[1] += s[1];
+        return score[2] += s[2];

       });
       return this.show_score(score);
     };
 
       });
       return this.show_score(score);
     };
 

-    Excercise.prototype.show_solutions = function() {
+    Exercise.prototype.show_solutions = function() {

       var _this = this;
       this.reset();
       return $(".question", this.element).each(function(i, question) {
       var _this = this;
       this.reset();
       return $(".question", this.element).each(function(i, question) {


@@ -85,7 +98,7 @@
       });
     };
 
       });
     };
 

-    Excercise.prototype.get_value_list = function(elem, data_key, numbers) {
+    Exercise.prototype.get_value_list = function(elem, data_key, numbers) {

       var vl;
       vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim);
       if (numbers) {
       var vl;
       vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim);
       if (numbers) {


@@ -96,7 +109,7 @@
       return vl;
     };
 
       return vl;
     };
 

-    Excercise.prototype.get_value_optional_list = function(elem, data_key) {
+    Exercise.prototype.get_value_optional_list = function(elem, data_key) {

       var mandat, opt, v, vals, _i, _len;
       vals = this.get_value_list(elem, data_key);
       mandat = [];
       var mandat, opt, v, vals, _i, _len;
       vals = this.get_value_list(elem, data_key);
       mandat = [];


@@ -112,15 +125,22 @@
       return [mandat, opt];
     };
 
       return [mandat, opt];
     };
 

-    Excercise.prototype.show_score = function(score) {
-      return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]);
+    Exercise.prototype.show_score = function(score) {
+      var $msg;
+      $msg = $(".message", this.element);
+      $msg.text("Wynik: " + score[0] + " / " + score[2]);
+      if (score[0] >= score[2] && score[1] === 0) {
+        return $msg.addClass("maxscore");
+      } else {
+        return $msg.removeClass("maxscore");
+      }

     };
 
     };
 

-    Excercise.prototype.draggable_equal = function($draggable1, $draggable2) {
+    Exercise.prototype.draggable_equal = function($draggable1, $draggable2) {

       return false;
     };
 
       return false;
     };
 

-    Excercise.prototype.draggable_accept = function($draggable, $droppable) {
+    Exercise.prototype.draggable_accept = function($draggable, $droppable) {

       var d, dropped, _i, _len;
       dropped = $droppable.closest("ul, ol").find(".draggable");
       for (_i = 0, _len = dropped.length; _i < _len; _i++) {
       var d, dropped, _i, _len;
       dropped = $droppable.closest("ul, ol").find(".draggable");
       for (_i = 0, _len = dropped.length; _i < _len; _i++) {


@@ -132,7 +152,7 @@
       return true;
     };
 
       return true;
     };
 

-    Excercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) {
+    Exercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) {

       var $added,
         _this = this;
       $added = $draggable.clone();
       var $added,
         _this = this;
       $added = $draggable.clone();


@@ -144,23 +164,31 @@
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }

-      $added.append('<span class="remove">x</span>');
+      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();
+        _this.retry();

         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();
       });
     };
 

-    Excercise.prototype.dragging = function(ismultiple, issortable) {
+    Exercise.prototype.dragging = function(ismultiple, issortable) {

       var _this = this;
       return $(".question", this.element).each(function(i, question) {
         var draggable_opts, self;
         draggable_opts = {
           revert: 'invalid',
       var _this = this;
       return $(".question", this.element).each(function(i, question) {
         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;


@@ -196,7 +224,7 @@
       });
     };
 
       });
     };
 

-    return Excercise;
+    return Exercise;

 
   })(Binding);
 
 
   })(Binding);
 


@@ -206,13 +234,15 @@
 
     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) {

-      var all, good, solution,
+      var all, bad, good, solution,

         _this = this;
       all = 0;
       good = 0;
         _this = this;
       all = 0;
       good = 0;

+      bad = 0;

       solution = this.get_value_list(question, 'solution');
       $(".question-piece", question).each(function(i, qpiece) {
         var is_checked, piece_name, piece_no, should_be_checked;
       solution = this.get_value_list(question, 'solution');
       $(".question-piece", question).each(function(i, qpiece) {
         var is_checked, piece_name, piece_no, should_be_checked;


@@ -232,13 +262,14 @@
             good += 1;
             return _this.piece_correct(qpiece);
           } else {
             good += 1;
             return _this.piece_correct(qpiece);
           } else {

+            bad += 1;

             return _this.piece_incorrect(qpiece);
           }
         } else {
           return $(qpiece).removeClass("correct,incorrect");
         }
       });
             return _this.piece_incorrect(qpiece);
           }
         } else {
           return $(qpiece).removeClass("correct,incorrect");
         }
       });

-      return [good, all];
+      return [good, bad, all];

     };
 
     Wybor.prototype.solve_question = function(question) {
     };
 
     Wybor.prototype.solve_question = function(question) {


@@ -255,13 +286,13 @@
           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);

       });
     };
 
     return Wybor;
 
       });
     };
 
     return Wybor;
 

-  })(Excercise);
+  })(Exercise);

 
   Uporzadkuj = (function(_super) {
 
 
   Uporzadkuj = (function(_super) {
 


@@ -270,16 +301,18 @@
     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

       });
     }
 
     Uporzadkuj.prototype.check_question = function(question) {
       });
     }
 
     Uporzadkuj.prototype.check_question = function(question) {

-      var all, correct, pkt, pkts, positions, sorted, _i, _ref;
+      var all, bad, correct, pkt, pkts, positions, sorted, _i, _ref;

       positions = this.get_value_list(question, 'original', true);
       sorted = positions.sort();
       pkts = $('.question-piece', question);
       correct = 0;
       positions = this.get_value_list(question, 'original', true);
       sorted = positions.sort();
       pkts = $('.question-piece', question);
       correct = 0;

+      bad = 0;

       all = 0;
       for (pkt = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) {
         all += 1;
       all = 0;
       for (pkt = _i = 0, _ref = pkts.length; 0 <= _ref ? _i < _ref : _i > _ref; pkt = 0 <= _ref ? ++_i : --_i) {
         all += 1;


@@ -287,10 +320,11 @@
           correct += 1;
           this.piece_correct(pkts.eq(pkt));
         } else {
           correct += 1;
           this.piece_correct(pkts.eq(pkt));
         } else {

+          bad += 1;

           this.piece_incorrect(pkts.eq(pkt));
         }
       }
           this.piece_incorrect(pkts.eq(pkt));
         }
       }

-      return [correct, all];
+      return [correct, bad, all];

     };
 
     Uporzadkuj.prototype.solve_question = function(question) {
     };
 
     Uporzadkuj.prototype.solve_question = function(question) {


@@ -321,7 +355,7 @@
 
     return Uporzadkuj;
 
 
     return Uporzadkuj;
 

-  })(Excercise);
+  })(Exercise);

 
   Luki = (function(_super) {
 
 
   Luki = (function(_super) {
 


@@ -333,22 +367,23 @@
     }
 
     Luki.prototype.check = function() {
     }
 
     Luki.prototype.check = function() {

-      var all, correct,
+      var all, bad, correct,

         _this = this;
         _this = this;

-      all = 0;
+      all = $(".placeholder", this.element).length;

       correct = 0;
       correct = 0;

+      bad = 0;

       $(".placeholder + .question-piece", this.element).each(function(i, qpiece) {
         var $placeholder;
         $placeholder = $(qpiece).prev(".placeholder");
         if ($placeholder.data('solution') === $(qpiece).data('no')) {
           _this.piece_correct(qpiece);
       $(".placeholder + .question-piece", this.element).each(function(i, qpiece) {
         var $placeholder;
         $placeholder = $(qpiece).prev(".placeholder");
         if ($placeholder.data('solution') === $(qpiece).data('no')) {
           _this.piece_correct(qpiece);

-          correct += 1;
+          return correct += 1;

         } else {
         } else {

-          _this.piece_incorrect(qpiece);
+          bad += 1;
+          return _this.piece_incorrect(qpiece);

         }
         }

-        return all += 1;

       });
       });

-      return this.show_score([correct, all]);
+      return this.show_score([correct, bad, all]);

     };
 
     Luki.prototype.solve_question = function(question) {
     };
 
     Luki.prototype.solve_question = function(question) {


@@ -362,7 +397,7 @@
 
     return Luki;
 
 
     return Luki;
 

-  })(Excercise);
+  })(Exercise);

 
   Zastap = (function(_super) {
 
 
   Zastap = (function(_super) {
 


@@ -378,10 +413,11 @@
     }
 
     Zastap.prototype.check = function() {
     }
 
     Zastap.prototype.check = function() {

-      var all, correct,
+      var all, bad, correct,

         _this = this;
       all = 0;
       correct = 0;
         _this = this;
       all = 0;
       correct = 0;

+      bad = 0;

       $(".paragraph", this.element).each(function(i, par) {
         return $(".placeholder", par).each(function(j, qpiece) {
           var $dragged, $qp;
       $(".paragraph", this.element).each(function(i, par) {
         return $(".placeholder", par).each(function(j, qpiece) {
           var $dragged, $qp;


@@ -396,7 +432,7 @@
           }
         });
       });
           }
         });
       });

-      return this.show_score([correct, all]);
+      return this.show_score([correct, bad, all]);

     };
 
     Zastap.prototype.show_solutions = function() {
     };
 
     Zastap.prototype.show_solutions = function() {


@@ -453,7 +489,7 @@
 
     return Zastap;
 
 
     return Zastap;
 

-  })(Excercise);
+  })(Exercise);

 
   Przyporzadkuj = (function(_super) {
 
 
   Przyporzadkuj = (function(_super) {
 


@@ -464,7 +500,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;
         }
       }


@@ -482,20 +518,24 @@
     };
 
     Przyporzadkuj.prototype.check_question = function(question) {
     };
 
     Przyporzadkuj.prototype.check_question = function(question) {

-      var all, count, mandatory, minimum, optional, pn, pred, qp, v, _i, _j, _len, _len1, _ref, _ref1;
+      var all, bad_count, count, mandatory, minimum, optional, pn, pred, qp, self, v, _i, _j, _len, _len1, _ref, _ref1;

       minimum = $(question).data("minimum");
       count = 0;
       minimum = $(question).data("minimum");
       count = 0;

+      bad_count = 0;

       all = 0;
       if (!minimum) {
       all = 0;
       if (!minimum) {

-        all = $(".subjects .question-piece", question).length;
+        self = this;
+        $(".subject .question-piece", question).each(function(i, el) {
+          var mandatory, v;
+          v = self.get_value_optional_list(el, 'solution');
+          mandatory = v[0];
+          return all += mandatory.length;
+        });

       }
       _ref = $(".predicate [data-predicate]", question);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         pred = _ref[_i];
         pn = $(pred).attr('data-predicate');
       }
       _ref = $(".predicate [data-predicate]", question);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         pred = _ref[_i];
         pn = $(pred).attr('data-predicate');

-        if (minimum != null) {
-          all += minimum;
-        }

         _ref1 = $(".question-piece", pred);
         for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
           qp = _ref1[_j];
         _ref1 = $(".question-piece", pred);
         for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
           qp = _ref1[_j];


@@ -506,11 +546,12 @@
             count += 1;
             this.piece_correct(qp);
           } else {
             count += 1;
             this.piece_correct(qp);
           } else {

+            bad_count += 1;

             this.piece_incorrect(qp);
           }
         }
       }
             this.piece_incorrect(qp);
           }
         }
       }

-      return [count, all];
+      return [count, bad_count, all];

     };
 
     Przyporzadkuj.prototype.solve_question = function(question) {
     };
 
     Przyporzadkuj.prototype.solve_question = function(question) {


@@ -535,7 +576,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));


@@ -545,35 +586,39 @@
 
     return Przyporzadkuj;
 
 
     return Przyporzadkuj;
 

-  })(Excercise);
+  })(Exercise);

 
   PrawdaFalsz = (function(_super) {
 
     __extends(PrawdaFalsz, _super);
 
     function PrawdaFalsz(element) {
 
   PrawdaFalsz = (function(_super) {
 
     __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');

         });
       }
     }
 
     PrawdaFalsz.prototype.check_question = function() {
         });
       }
     }
 
     PrawdaFalsz.prototype.check_question = function() {

-      var all, good, qp, _i, _len, _ref;
+      var all, bad, good, qp, _i, _len, _ref;

       all = 0;
       good = 0;
       all = 0;
       good = 0;

+      bad = 0;

       _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];


@@ -581,21 +626,22 @@
           good += 1;
           this.piece_correct(qp);
         } else {
           good += 1;
           this.piece_correct(qp);
         } else {

+          bad += 1;

           this.piece_incorrect(qp);
         }
         all += 1;
       }
           this.piece_incorrect(qp);
         }
         all += 1;
       }

-      return [good, all];
+      return [good, bad, all];

     };
 
     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());


@@ -606,9 +652,9 @@
 
     return PrawdaFalsz;
 
 
     return PrawdaFalsz;
 

-  })(Excercise);
+  })(Exercise);

 
 

-  excercise = function(ele) {
+  exercise = function(ele) {

     var cls, es;
     es = {
       wybor: Wybor,
     var cls, es;
     es = {
       wybor: Wybor,


@@ -628,8 +674,8 @@
 
   $(document).ready(function() {
     new EduModule($("#book-text"));
 
   $(document).ready(function() {
     new EduModule($("#book-text"));

-    return $(".excercise").each(function(i, el) {
-      return excercise(this);
+    return $(".exercise").each(function(i, el) {
+      return exercise(this);

     });
   });
 
     });
   });