Merge pull request #952 from molchanoviv/master

Fix for incorrect replace of prototype placeholders in nested collections

Author: phiamo

Resources/doc/3.1-form-collections.md

@@ -62,6 +62,43 @@ Some things are currently missing :
  * examples on howto extend the functionality with check functions for adding and removing
  * in depth example on howto use Custom FormTypes easily
 
+Nested collections
+----------------------
+
+MopaBootstrapBundle supports nested collections. You can use them as shown below.
+
+At first you need to create a child Form Type with some collection
+```php
+class MyChildType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('mySubCollection', 'collection', [
+                    'type' => 'text',
+                ])
+        ;
+    }
+}
+```
+
+After it you need to create a parent Form Type which will use your child form type as a type of collection items.
+
+```php
+class MyParentType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('myCollection', 'collection', [
+                    'type' => new MyChildType(),
+                ])
+        ;
+    }
+}
+```
+That's it.
+
 ---
 
 << [Form Extensions](https://github.com/phiamo/MopaBootstrapBundle/blob/master/Resources/doc/3-form-extension-templates.md) | [Form Tabs](https://github.com/phiamo/MopaBootstrapBundle/blob/master/Resources/doc/3.2-form-tabs.md) >>

Resources/public/js/mopabootstrap-collection.js

@@ -69,11 +69,11 @@
                 prototype_label = '__name__label__';
             }
 
-            var name_replace_pattern = new RegExp(prototype_name, 'g');
-            var label_replace_pattern = new RegExp(prototype_label, 'g');
+            var name_replace_pattern = new RegExp("((\"|"|'|')((?!(\"|"|'|'|__name__)).)+?)(" + prototype_name + ")", 'ig');
+            var label_replace_pattern = new RegExp("((\"|"|'|')((?!(\"|"|'|'|__name__)).)+?)(" + prototype_label + ")", 'ig');
             var rowContent = $collection.attr('data-prototype')
-                    .replace(label_replace_pattern, index)
-                    .replace(name_replace_pattern, index);
+                    .replace(label_replace_pattern, "$1" + index)
+                    .replace(name_replace_pattern, "$1" + index);
             var row = $(rowContent);
             if (false !== $(window).triggerHandler('before-add.mopa-collection-item', [$collection, row, index])) {
                 $collection.append(row);