From 1c0900268193cf40f818c39059fa9384855aff8c Mon Sep 17 00:00:00 2001 From: montabou Date: Wed, 5 Mar 2014 19:59:25 +0100 Subject: [PATCH 1/2] Fix $field for single upload --- Resources/views/Form/form_javascripts.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/views/Form/form_javascripts.html.twig b/Resources/views/Form/form_javascripts.html.twig index 00cbc9c..f84fbe4 100644 --- a/Resources/views/Form/form_javascripts.html.twig +++ b/Resources/views/Form/form_javascripts.html.twig @@ -342,7 +342,7 @@ var $field = $('#{{ id }}'); {% block afe_single_upload_afe_javascript_prototype %} - $('#{{ id }}').singleUpload({ + $field.singleUpload({ minWidth: {{ minWidth|e4js }}, minHeight: {{ minHeight|e4js }}, maxWidth: {{ maxWidth|e4js }}, From 02774edb0c9af1aeb8c3b1239f154876a01a54ba Mon Sep 17 00:00:00 2001 From: montabou Date: Wed, 5 Mar 2014 20:04:06 +0100 Subject: [PATCH 2/2] Fix https://github.com/avocode/FormExtensions/issues/74 --- Resources/views/Form/form_javascripts.html.twig | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Resources/views/Form/form_javascripts.html.twig b/Resources/views/Form/form_javascripts.html.twig index f84fbe4..0a0819a 100644 --- a/Resources/views/Form/form_javascripts.html.twig +++ b/Resources/views/Form/form_javascripts.html.twig @@ -3,10 +3,19 @@ {% for child in form %} {{ afe_form_javascript(child) }} {% endfor %} - {% block form_afe_javascript_prototype %}{% endblock form_afe_javascript_prototype %} {% endspaceless %} {% endblock form_afe_javascript %} +{% block form_afe_javascript_prototype %} +{% spaceless %} + {% for child in form %} + parent.push('{{ child.vars.name }}'); + $field = $('#' + id + '_' + parent.join('_')); + {{ afe_form_javascript(child, true) }} + parent.pop(); {% endfor %} +{% endspaceless %} +{% endblock form_afe_javascript_prototype %} + {% block field_afe_javascript "" %} {% block button_afe_javascript "" %} @@ -26,11 +35,14 @@ confirm_batch: {{ 'afe_bootstrap_collection.confirm.batchDelete'|trans({}, 'AvocodeFormExtensions')|e4js }} }, javascript: function(id) { + parent = []; {% if prototype is defined %} {% if prototype.vars.compound %} {% for child in prototype %} - $field = $('#' + id + '_{{ child.vars.name }}'); + parent.push('{{ child.vars.name }}'); + $field = $('#' + id + '_' + parent.join('_')); {{ afe_form_javascript(child, true) }} + parent.pop(); {% endfor %} {% else %} $field = $('#' + id);