Merge branch 'merge_1' into edumed

[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 cc7b9e1..e3878be 100644 (file)
--- a/redakcja/static/edumed/js/edumed.js
+++ b/redakcja/static/edumed/js/edumed.js
@@ -152,12 +152,18 @@
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }

+      if ($added.is(".add-li")) {
+        $added.wrap("<li/>");
+      }

       $added.append('<span class="remove">x</span>');
       return $('.remove', $added).click(function(ev) {
       $added.append('<span class="remove">x</span>');
       return $('.remove', $added).click(function(ev) {

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

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