place element using after instead of append

jeremymarc · May 8, 2014 · 4867538 · 4867538
1 parent 5a15f45
commit 4867538
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/jquery.formtag.js b/jquery.formtag.js
@@ -20,15 +20,16 @@
 }(function ($) {
   var formElements = [],
       $addMenu,
-      $tags;
+      $tags,
+      $addTagLink;
 
   var tagForm = function() {
       var _ = this;
 
       //default options
       _.options =  {
         add_button_text: '+ Add Field',
-        add_button_class: 'btn add-field',
+        add_button_class: 'add_field',
         tag_label: '~',
         namespace: 'tagForm-',
       };
@@ -50,20 +51,19 @@
         });
 
         // Add Tag Link
-        var $addTagLink = $('<a/>');
+        $addTagLink = $('<a/>');
         $addTagLink.html(_.options.add_button_text).addClass(_.options.namespace + _.options.add_button_class);
-        $addTagLink.on('click', function() {
+        $addTagLink.click(function() {
           updateAddMenuElementsVisibility();
-          $addMenu.show();
         });
 
         // Generate tags for form elements set
         $tags = $('<div/>').addClass(_.options.namespace + 'tags');
         _.tag.init();
 
-        $form.parent().append($tags);
+        $form.after($tags);
+        $tags.after($addTagLink);
         _.initMenu($form);
-        $form.parent().append($addTagLink);
 
         // close tag menu on click
         $(document).click(function(e) {
@@ -93,14 +93,20 @@
 
           $addMenu.append($li);
         });
-        $form.parent().append($addMenu);
+        $tags.after($addMenu);
 
         $addMenu.on('click', function(e) {
           _.tag.add($(e.target).data());
 
-          $('.tag:last-child ul').show();
+          $('.' + _.options.namespace + 'tag:last-child ul').show();
           $addMenu.hide();
 
+          //all form elements are displayed
+          if (formElements.length == $tags.find('.' + _.options.namespace + 'tag').length) {
+            $addTagLink.hide();
+            return false;
+          }
+
           return false;
         });
       }
@@ -204,6 +210,8 @@
               .trigger('change');
 
             $target.parent().remove();
+
+            $addTagLink.show();
           });
 
           $div.append($a);
@@ -289,6 +297,8 @@
         $li.show();
       }
     });
+
+    $addMenu.show();
   };
 
   function isTagShown($element) {