dynamic-fields-for 1.0.3 → 1.0.4

data/app/assets/javascripts/dynamic-fields-for.js

@@ -53,7 +53,7 @@
 
     DynamicFields.prototype.add = function() {
       var fields_add;
-      fields_add = $(this._render_insertion('Add'));
+      fields_add = $($.parseHTML(this._render_insertion('Add'), null, true));
       this.$fields_parent.trigger('dynamic-fields:before-add-into');
       this.$fields_end.before(fields_add);
       fields_add.not('script').trigger('dynamic-fields:after-add');
@@ -61,7 +61,7 @@
     };
 
     DynamicFields.prototype.remove = function($element) {
-      var destroy_inputs, fields_item_begin, fields_remove, node, object_id;
+      var all_fields, destroy_inputs, fields_item_begin, fields_remove, index_begin, index_end, node, object_id;
       node = $element;
       while ((fields_item_begin = node.prevAll((this._anchor('item-begin')) + ":first"), fields_item_begin.length === 0)) {
         node = node.parent();
@@ -76,7 +76,10 @@
         destroy_inputs = this._render_insertion('Remove').replace(/(["])dynamic_fields_object_id(["])/g, "$1" + object_id + "$2");
         this.$fields_begin.after(destroy_inputs);
       }
-      fields_remove = fields_item_begin.nextUntil((this._anchor('item-begin')) + ", " + (this._anchor('end'))).andSelf();
+      all_fields = this.$fields_parent.contents();
+      index_begin = all_fields.index(fields_item_begin);
+      index_end = all_fields.index(fields_item_begin.nextAll((this._anchor('item-begin')) + ", " + (this._anchor('end'))).first());
+      fields_remove = all_fields.slice(index_begin, index_end);
       this.$fields_parent.trigger('dynamic-fields:before-remove-from');
       fields_remove.not('script').trigger('dynamic-fields:before-remove');
       fields_remove.remove();

data/lib/dynamic-fields-for/version.rb

@@ -1,3 +1,3 @@
 module DynamicFieldsFor
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/spec/features/dynamic_fields_for_spec.rb

@@ -67,6 +67,22 @@ describe DynamicFieldsFor do
       expect(page).to have_button('Update User')
     end
 
+    it 'should add fields with clean text' do
+      visit "/users/#{user.id}/edit_with_clean_text"
+      within('.clean-text') do
+        click_link 'Add role'
+        expect(page).to have_content(Array.new(4, 'clean text').push('Add role').join(' '))
+      end
+    end
+
+    it 'should remove fields with clean text' do
+      visit "/users/#{user.id}/edit_with_clean_text"
+      within('.clean-text-with-remove-link') do
+        remove_links.last.click
+        expect(page).to have_content(Array.new(2, 'clean text Remove role').push('Add role').join(' '))
+      end
+    end
+
     it 'should deal with turbolinks' do
       visit "/users/#{user.id}/edit_without_fields"
       click_link 'Edit'

data/spec/rails_app/app/controllers/users_controller.rb

@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
   before_filter :build_resource, only: [:new, :create]
-  before_filter :load_resource, only: [:edit, :update, :edit_without_fields, :events]
+  before_filter :load_resource, except: [:new, :create]
 
   def new
     3.times{ @resource.roles.build }

data/spec/rails_app/app/views/users/edit_with_clean_text.html.haml

@@ -0,0 +1,14 @@
+.clean-text
+  = form_for @resource do |f|
+    = f.fields_for :roles, dynamic: true do |rf|
+      clean text
+
+    = f.add_fields_link :roles, 'Add role'
+
+.clean-text-with-remove-link
+  = form_for @resource do |f|
+    = f.fields_for :roles, dynamic: true do |rf|
+      clean text
+      = rf.remove_fields_link 'Remove role'
+
+    = f.add_fields_link :roles, 'Add role'

data/spec/rails_app/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   resources :users do
     member do
       get 'edit_without_fields'
+      get 'edit_with_clean_text'
       get 'events'
     end
   end