awesome_nested_fields 0.4.0 → 0.5.0

data/README.md

@@ -192,10 +192,10 @@ The code above inserts a new item and does not execute the `beforeInsert` callba
 These methods can be called from the element where nested fields are applied (e.g. a form) or from any element inside it (e.g. an input or the container itself).
 
 
-Multiples Nested Fields
+Multiple Nested Fields
 -----------------------
 
-It is easy to have multiple nested fields on the same page. Instead of applying `nestedFields()` on the form, put the elements (items, container, add, remove) inside a wrapper and apply nested fields to it.
+It is easy to have multiple nested fields on the same page. Instead of applying `nestedFields()` to the form, put the elements (items, container, add, remove) inside a wrapper and apply nested fields to it.
 
     <!-- ERB Code -->
     <h2>Phones</h2>

data/lib/awesome_nested_fields.rb

@@ -6,6 +6,16 @@ module AwesomeNestedFields
   end
   
   require 'awesome_nested_fields/version'
+  
+  def self.escape_html_tags(html)
+    html.gsub(/[&><]/) do |char|
+      case char
+      when '<' then '&lt;'
+      when '>' then '&gt;'
+      when '&' then '&amp;'
+      end
+    end.html_safe
+  end
 end
 
 require 'rails/form_helper'

data/lib/awesome_nested_fields/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedFields
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/rails/form_helper.rb

@@ -9,6 +9,7 @@ ActionView::Helpers::FormBuilder.class_eval do
     options[:empty_template_class] ||= ['template', 'empty', association.to_s.singularize].join(' ')
     options[:show_empty] ||= false
     options[:render_template] = options.key?(:render_template) ? options[:render_template] : true
+    options[:escape_template] = options.key?(:escape_template) ? options[:escape_template] : true
     
     output = @template.capture { fields_for(association, &block) }
     
@@ -30,11 +31,15 @@ protected
   
   def render_nested_fields_template(association, options, &block)
     templates = @template.content_tag(:script, type: 'text/html', class: options[:item_template_class]) do
-      fields_for(association, options[:new_object], child_index: options[:new_item_index], &block)
+      template = fields_for(association, options[:new_object], child_index: options[:new_item_index], &block)
+      template = AwesomeNestedFields.escape_html_tags(template) if options[:escape_template]
+      template
     end
     
     if options[:show_empty]
-      templates.safe_concat @template.content_tag(:script, type: 'text/html', class: options[:empty_template_class], &block)
+      template = @template.content_tag(:script, type: 'text/html', class: options[:empty_template_class], &block)
+      template = AwesomeNestedFields.escape_html_tags(template) if options[:escape_template]
+      templates << template
     end
     
     templates

data/vendor/assets/javascripts/jquery.nested-fields.js

@@ -20,7 +20,8 @@
     emptySelector: '.empty',
     addSelector: '.add',
     removeSelector: '.remove',
-    newItemIndex: 'new_nested_item'
+    newItemIndex: 'new_nested_item',
+    unescapeTemplate: true
   };
   
   // PUBLIC API
@@ -29,10 +30,7 @@
       return this.each(function() {        
         var $this = $(this);
         if($(this).data('nested-fields.options')) {
-          console.log('Nested fields already defined for this element. If you want to redefine options, destroy it and init again.');
-          return $this;
-        } else if(getOptions($this)) {
-          console.log('You cannot nest nested fields. Who would say that, uh?');
+          log('Nested fields already defined for this element. If you want to redefine options, destroy it and init again.');
           return $this;
         }
 
@@ -81,20 +79,20 @@
     } else if (typeof method === 'object' || !method) {
       return methods.init.apply(this, arguments);
     } else {
-      $.error( 'Method ' +  method + ' does not exist on jQuery.nestedFields' );
+      $.error('Method ' +  method + ' does not exist on jQuery.nestedFields');
     }
   };
   
   // Initialization functions
   
   function getOptions(element) {
-    element = $(element);
-    while(element.length > 0) {
-      var data = element.data('nested-fields.options');
+    var $element = $(element);
+    while($element.length > 0) {
+      var data = $element.data('nested-fields.options');
       if(data) {
         return data;
       } else {
-        element = element.parent();
+        $element = $element.parent();
       }
     }
     return null;
@@ -120,6 +118,9 @@
     var newId = new Date().getTime();
     
     var contents = options.itemTemplate.html();
+    if(options['unescapeTemplate']) {
+      contents = unescape_html_tags(contents);
+    }
     var newItem = $(contents.replace(regexp, newId));
     newItem.attr('data-new-record', true);
     newItem.attr('data-record-id', newId);
@@ -219,4 +220,18 @@
     return options.container.find(options.emptySelector);
   }
   
+  // Utility functions
+  
+  function unescape_html_tags(html) {
+    var e = document.createElement('div');
+    e.innerHTML = html;
+    return e.childNodes.length === 0 ? "" : e.childNodes[0].nodeValue;
+  }
+  
+  function log(msg) {
+    if(console && console.log) {
+      console.log(msg);
+    }
+  }
+  
 })(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_fields
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-23 00:00:00.000000000 -03:00
+date: 2011-07-26 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156407920 !ruby/object:Gem::Requirement
+  requirement: &2156094920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156407920
+  version_requirements: *2156094920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156407420 !ruby/object:Gem::Requirement
+  requirement: &2156094260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156407420
+  version_requirements: *2156094260
 description: Awesome dynamic nested fields for Rails and jQuery
 email: lailson@guava.com.br
 executables: []