exercises: retry after move

diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index c3d8fa7..7c40bff 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -28,15 +28,18 @@ class Exercise extends Binding
       $(ev.target).next(".retry").show()
       $(ev.target).hide()
     $(".retry", @element).click (ev) =>
       $(ev.target).next(".retry").show()
       $(ev.target).hide()
     $(".retry", @element).click (ev) =>

-      $(".correct, .incorrect", @element).removeClass("correct incorrect")
-      $(ev.target).prev(".check").show()
-      $(ev.target).hide()
+      @retry()

     $('.solutions', @element).click =>
       @show_solutions()
       $(".comment", @element).show()
     $('.reset', @element).click =>
       @reset()
 
     $('.solutions', @element).click =>
       @show_solutions()
       $(".comment", @element).show()
     $('.reset', @element).click =>
       @reset()
 

+  retry: ->
+    $(".correct, .incorrect", @element).removeClass("correct incorrect")
+    $(".check", @element).show()
+    $(".retry", @element).hide()
+

   reset: ->
     $(@element).html($(@element).data('exercise-html'))
     exercise @element
   reset: ->
     $(@element).html($(@element).data('exercise-html'))
     exercise @element


@@ -136,6 +139,7 @@ class Exercise extends Binding
       draggable_opts =
         revert: 'invalid'
         helper: 'clone'
       draggable_opts =
         revert: 'invalid'
         helper: 'clone'

+        start: @retry

 
       $(".draggable", question).draggable(draggable_opts)
       self = this
 
       $(".draggable", question).draggable(draggable_opts)
       self = this


@@ -188,6 +192,7 @@ class Exercise extends Binding
 class Wybor extends Exercise
   constructor: (element) ->
     super element
 class Wybor extends Exercise
   constructor: (element) ->
     super element

+    $(".question-piece input", element).change(@retry);

 
 
   check_question: (question) ->
 
 
   check_question: (question) ->


@@ -234,7 +239,7 @@ class Wybor extends Exercise
 class Uporzadkuj extends Exercise
   constructor: (element) ->
     super element
 class Uporzadkuj extends Exercise
   constructor: (element) ->
     super element

-    $('ol, ul', @element).sortable({ items: "> li" })
+    $('ol, ul', @element).sortable({ items: "> li", start: @retry })

 
   check_question: (question) ->
     positions = @get_value_list(question, 'original', true)
 
   check_question: (question) ->
     positions = @get_value_list(question, 'original', true)


@@ -431,10 +436,12 @@ class PrawdaFalsz extends Exercise
     for qp in $(".question-piece", @element)
       $(".true", qp).click (ev) ->
         ev.preventDefault()
     for qp in $(".question-piece", @element)
       $(".true", qp).click (ev) ->
         ev.preventDefault()

+        @retry()

         $(this).closest(".question-piece").data("value", "true")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
       $(".false", qp).click (ev) ->
         ev.preventDefault()
         $(this).closest(".question-piece").data("value", "true")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
       $(".false", qp).click (ev) ->
         ev.preventDefault()

+        @retry()

         $(this).closest(".question-piece").data("value", "false")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
 
         $(this).closest(".question-piece").data("value", "false")
         $(this).addClass('chosen').siblings('a').removeClass('chosen')
 

diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js
index b4912dd..817dd95 100644 (file)
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.3.3

 (function() {
   var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,
     __hasProp = {}.hasOwnProperty,
 (function() {
   var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise,
     __hasProp = {}.hasOwnProperty,


@@ -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);


@@ -155,7 +159,7 @@
       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) {
         if (!ismultiple) {
           $($added.data('original')).removeClass('disabled').draggable('enable');
       return $('.remove', $added).click(function(ev) {
         if (!ismultiple) {
           $($added.data('original')).removeClass('disabled').draggable('enable');


@@ -174,7 +178,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 +225,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 +290,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

       });
     }
 
       });
     }
 


@@ -573,11 +580,13 @@
         qp = _ref[_i];
         $(".true", qp).click(function(ev) {
           ev.preventDefault();
         qp = _ref[_i];
         $(".true", qp).click(function(ev) {
           ev.preventDefault();

+          this.retry();

           $(this).closest(".question-piece").data("value", "true");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });
         $(".false", qp).click(function(ev) {
           ev.preventDefault();
           $(this).closest(".question-piece").data("value", "true");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });
         $(".false", qp).click(function(ev) {
           ev.preventDefault();

+          this.retry();

           $(this).closest(".question-piece").data("value", "false");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });
           $(this).closest(".question-piece").data("value", "false");
           return $(this).addClass('chosen').siblings('a').removeClass('chosen');
         });