add a clearing div in exercises

[redakcja.git] / redakcja / static / edumed / js / edumed.coffee

diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee
index 14c700c..c3d8fa7 100644 (file)
--- a/redakcja/static/edumed/js/edumed.coffee
+++ b/redakcja/static/edumed/js/edumed.coffee
@@ -116,13 +116,20 @@ class Exercise extends Binding
     $placeholder.after($added)
     if not $placeholder.hasClass('multiple')
       $placeholder.hide()
     $placeholder.after($added)
     if not $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>')

     $('.remove', $added).click (ev) =>
     $('.remove', $added).click (ev) =>

-      $added.prev(".placeholder:not(.multiple)").show()

       if not ismultiple
         $($added.data('original')).removeClass('disabled').draggable('enable')
       if not ismultiple
         $($added.data('original')).removeClass('disabled').draggable('enable')

+
+      if $added.is(".add-li")
+        $added = $added.closest('li')
+      $added.prev(".placeholder:not(.multiple)").show()

       $added.remove()
 
       $added.remove()
 

+

 ## XXX co z issortable?
   dragging: (ismultiple, issortable) ->
     $(".question", @element).each (i, question) =>
 ## XXX co z issortable?
   dragging: (ismultiple, issortable) ->
     $(".question", @element).each (i, question) =>


@@ -220,7 +227,7 @@ class Wybor extends Exercise
       else
         should_be_checked = solution.indexOf(piece_no) >= 0
       console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked)
       else
         should_be_checked = solution.indexOf(piece_no) >= 0
       console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked)

-      $("input[type=checkbox]", qpiece).prop 'checked', should_be_checked
+      $("input[type=checkbox],input[type=radio]", qpiece).prop 'checked', should_be_checked

 
 
 
 
 
 


@@ -447,9 +454,9 @@ class PrawdaFalsz extends Exercise
     return [good, all]
 
   show_solutions: ->
     return [good, all]
 
   show_solutions: ->

-    reset()
+    @reset()

     for qp in $(".question-piece", @element)
     for qp in $(".question-piece", @element)

-      if $(qp).data('solution') == 'true'
+      if $(qp).data('solution') == true

         $(".true", qp).click()
       else
         $(".false", qp).click()
         $(".true", qp).click()
       else
         $(".false", qp).click()


@@ -481,4 +488,4 @@ $(document).ready () ->
   new EduModule($("#book-text"))
 
   $(".exercise").each (i, el) ->
   new EduModule($("#book-text"))
 
   $(".exercise").each (i, el) ->

-    exercise(this)
\ No newline at end of file
+    exercise(this)