Merge branch 'fix-recaptcha' of git://github.com/Matteo-Peronnet/Widg…

…etFormBundle into Matteo-Peronnet-fix-recaptcha
Victoire · Apr 30, 2018 · d2eacb3 · d2eacb3
2 parents 3b22a63 + 43fe287
commit d2eacb3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/Resources/config/assetic_injector.json b/Resources/config/assetic_injector.json
@@ -4,13 +4,12 @@
         "javascripts":
         {
             "foot": [
-              "@VictoireWidgetFormBundle/Resources/public/js/validator.js",
-              "https://www.google.com/recaptcha/api.js"
+              "@VictoireWidgetFormBundle/Resources/public/js/validator.js"
             ]
         },
         "stylesheets":
         {
-            "head": "@VictoireWidgetFormBundle/Resources/public/css/recaptcha.css"
+            "victoire_widget_form_recaptcha": "@VictoireWidgetFormBundle/Resources/public/css/recaptcha.css"
         }
     }
 }
diff --git a/Resources/views/macros/form_elements.html.twig b/Resources/views/macros/form_elements.html.twig
@@ -1,15 +1,3 @@
 {% macro recaptcha(siteKey)%}
-
-    {% stylesheets injector="head"
-    '@VictoireWidgetFormBundle/Resources/public/css/recaptcha.css'
-    %}
-    {% endstylesheets %}
-
     <div class="g-recaptcha" data-sitekey="{{siteKey}}"></div>
-
-    {% javascripts injector="foot"
-    'http://www.google.com/recaptcha/api.js'
-    %}
-    {% endjavascripts %}
-
-{% endmacro %}
+{% endmacro %}
diff --git a/Resources/views/show.html.twig b/Resources/views/show.html.twig
@@ -135,9 +135,24 @@
         </div>
 
             {% if recaptcha_public_key is defined %}
+                {% stylesheets injector="victoire_widget_form_recaptcha"
+                %}
+                <link rel="stylesheet" href="{{ asset_url }}" />
+                {% endstylesheets %}
                 <div class="row">
                     <div class="col-xs-12">
                         {{formElements.recaptcha(recaptcha_public_key)}}
+                        <script type="text/javascript">
+                            (function() {
+                                if (!document.getElementById('google_recaptcha_script_tag')) {
+                                    var script = document.createElement('script');
+                                    script.type = 'text/javascript';
+                                    script.id = 'google_recaptcha_script_tag';
+                                    script.src = 'https://www.google.com/recaptcha/api.js?explicit&hl={{ app.request.locale }}';
+                                    document.getElementsByTagName('body')[0].appendChild(script);
+                                }
+                            })();
+                        </script>
                     </div>
                 </div>
             {% endif %}