freeform 1.0.4 → 1.0.5

data/spec/javascript_spec.rb

@@ -3,11 +3,10 @@ require 'spec_helper'
 describe 'JavaScript Behavior', :js => true do
   include Capybara::DSL
 
-  [:jquery, :prototype].each do |js_framework|
+  [:jquery].each do |js_framework|
 
     url = case js_framework
     when :jquery then '/projects/new'
-    when :prototype then '/projects/new?type=prototype'
     end
 
     context "with #{js_framework}" do

data/vendor/assets/javascripts/jquery_freeform.js

@@ -22,6 +22,7 @@
         context = context.replace(new RegExp('\\[' + current[1] + '\\]\\[(new_)?\\d+\\]$'), '');
       }
 
+
       // context will be something like this for a brand new form:
       // project[tasks_attributes][1255929127459][assignments_attributes][1255929128105]
       // or for an edit form:
@@ -45,7 +46,7 @@
 
       // Make a unique ID for the new child
       var regexp  = new RegExp('new_' + assoc, 'g');
-      var new_id  = this.newId();
+      var new_id  = this.newId(assoc);
       content     = $.trim(content.replace(regexp, new_id));
 
       var field = this.insertFields(content, assoc, link);
@@ -55,7 +56,11 @@
         .trigger({ type: 'nested:fieldAdded:' + assoc, field: field });
       return false;
     },
-    newId: function() {
+    newId: function(assoc) {
+      // Instead, I should try to count the number of matches so far, then add 1
+      // return new Date().getTime();
+      // This is close, but it doesn't work if there is not link_to_remove
+      // return $('div.fields a[data-association*="' + assoc + '"]').length;
       return new Date().getTime();
     },
     insertFields: function(content, assoc, link) {
@@ -69,13 +74,13 @@
     removeFields: function(e) {
       var $link = $(e.currentTarget),
           assoc = $link.data('association'); // Name of child to be removed
-      
+
       var hiddenField = $link.prev('input[type=hidden]');
       hiddenField.val('1');
-      
+
       var field = $link.closest('.fields');
       field.hide();
-      
+
       field
         .trigger({ type: 'nested:fieldRemoved', field: field })
         .trigger({ type: 'nested:fieldRemoved:' + assoc, field: field });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freeform
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -210,6 +210,7 @@ files:
 - lib/generators/freeform/install_generator.rb
 - lib/tasks/freeform_tasks.rake
 - spec/acceptance_spec.rb
+- spec/behavior_spec.rb
 - spec/builder/builder_spec.rb
 - spec/builder/view_helper_spec.rb
 - spec/dummy/README.rdoc
@@ -219,8 +220,6 @@ files:
 - spec/dummy/app/assets/javascripts/jquery.js
 - spec/dummy/app/assets/javascripts/jquery_events_test.js
 - spec/dummy/app/assets/javascripts/projects.js
-- spec/dummy/app/assets/javascripts/prototype.js
-- spec/dummy/app/assets/javascripts/prototype_events_test.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/stylesheets/companies.css
 - spec/dummy/app/assets/stylesheets/projects.css
@@ -241,7 +240,6 @@ files:
 - spec/dummy/app/views/companies/new.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/projects/new.html.erb
-- spec/dummy/app/views/projects/without_intermediate_inputs.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -281,7 +279,6 @@ files:
 - spec/persistence_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/jquery_freeform.js
-- vendor/assets/javascripts/prototype_freeform.js
 homepage: https://github.com/brycesenz/freeform
 licenses:
 - MIT
@@ -309,6 +306,7 @@ summary: FreeForm lets you compose forms however you like, explicitly guiding ho
   each field maps back to your domain models. No more accepting nested attributes!
 test_files:
 - spec/acceptance_spec.rb
+- spec/behavior_spec.rb
 - spec/builder/builder_spec.rb
 - spec/builder/view_helper_spec.rb
 - spec/dummy/README.rdoc
@@ -318,8 +316,6 @@ test_files:
 - spec/dummy/app/assets/javascripts/jquery.js
 - spec/dummy/app/assets/javascripts/jquery_events_test.js
 - spec/dummy/app/assets/javascripts/projects.js
-- spec/dummy/app/assets/javascripts/prototype.js
-- spec/dummy/app/assets/javascripts/prototype_events_test.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/stylesheets/companies.css
 - spec/dummy/app/assets/stylesheets/projects.css
@@ -340,7 +336,6 @@ test_files:
 - spec/dummy/app/views/companies/new.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/projects/new.html.erb
-- spec/dummy/app/views/projects/without_intermediate_inputs.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake