Merge pull request #569 from CityOfNewYork/johnyu95-fix-custom-forms-…

…loading

Fix Custom Forms Loading

app/static/js/request/new-request-agency.js

@@ -12,12 +12,10 @@
 "use strict";
 
 $(document).ready(function () {
-    $(window).on("load", function () {
-        // Determine if the agencyRequestInstructions and custom request forms need to be shown on page load.
-        getRequestAgencyInstructions();
-        // Check for custom request forms on page load (browser back button behavior).
-        getCustomRequestForms($("#request-agency").val());
-    });
+    // Determine if the agencyRequestInstructions and custom request forms need to be shown on page load.
+    getRequestAgencyInstructions();
+    // Check for custom request forms on page load (browser back button behavior).
+    getCustomRequestForms($("#request-agency").val());
 
     $("input[name='tz-name']").val(jstz.determine().name());
 

app/static/js/request/new-request-user.js

@@ -12,12 +12,10 @@
 "use strict";
 
 $(document).ready(function () {
-    $(window).on("load", function () {
-        // Determine if the agencyRequestInstructions need to be shown on page load.
-        getRequestAgencyInstructions();
-        // Check for custom request forms on page load (browser back button behavior).
-        getCustomRequestForms($("#request-agency").val());
-    });
+    // Determine if the agencyRequestInstructions need to be shown on page load.
+    getRequestAgencyInstructions();
+    // Check for custom request forms on page load (browser back button behavior).
+    getCustomRequestForms($("#request-agency").val());
 
     $("input[name='tz-name']").val(jstz.determine().name());
 

app/templates/base.html

@@ -76,7 +76,6 @@
 </div>
 <script type="text/javascript"
         src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
-<script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>
 <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/jquery.js') }}"></script>
 {{ moment.include_moment(local_js=url_for('static', filename='js/plugins/moment.min.js')) }}
 <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/bootstrap.min.js') }}"></script>

app/templates/main/contact.html

@@ -52,6 +52,7 @@ <h1 class="text-center">Technical Support</h1>
 {% endblock %}
 
 {% block custom_script %}
+    <script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/parsley.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/request/contact.js') }}"></script>
 {% endblock %}

app/templates/request/new_request_anon.html

@@ -253,6 +253,7 @@ <h3>Address</h3>
 {% endblock %}
 
 {% block custom_script %}
+    <script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/jquery-ui.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/parsley.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/jquery.mask.js') }}"></script>

app/templates/request/new_request_anon.js.html

@@ -10,26 +10,24 @@
     "use strict";
 
     $(document).ready(function () {
-        $(window).on("load", function () {
-            {% if kiosk_mode %}
-                $("#request-category").prop('disabled', true);
-                $("#request-agency").prop('disabled', true);
-                $("#request-title").prop('disabled', true);
-            {% endif %}
-            {% if category %}
-                $("#request-category option[value=\"{{ category }}\"]").attr('selected', 'selected');
-            {% endif %}
-            {% if agency %}
-                $("#request-agency option[value={{ agency }}]").attr('selected', 'selected');
-            {% endif %}
-            {% if title %}
-                $("#request-title").val("{{ title }}");
-            {% endif %}
-            // Determine if the agencyRequestInstructions need to be shown on page load.
-            getRequestAgencyInstructions();
-            // Check for custom request forms on page load (browser back button behavior).
-            getCustomRequestForms($("#request-agency").val());
-        });
+        {% if kiosk_mode %}
+            $("#request-category").prop('disabled', true);
+            $("#request-agency").prop('disabled', true);
+            $("#request-title").prop('disabled', true);
+        {% endif %}
+        {% if category %}
+            $("#request-category option[value=\"{{ category }}\"]").attr('selected', 'selected');
+        {% endif %}
+        {% if agency %}
+            $("#request-agency option[value={{ agency }}]").attr('selected', 'selected');
+        {% endif %}
+        {% if title %}
+            $("#request-title").val("{{ title }}");
+        {% endif %}
+        // Determine if the agencyRequestInstructions need to be shown on page load.
+        getRequestAgencyInstructions();
+        // Check for custom request forms on page load (browser back button behavior).
+        getCustomRequestForms($("#request-agency").val());
 
         $("input[name='tz-name']").val(jstz.determine().name());
 

app/templates/request/new_request_user.html

@@ -185,6 +185,7 @@ <h1>Request a Record</h1>
 {% endblock %}
 
 {% block custom_script %}
+    <script type="text/javascript" src="https://www.google.com/recaptcha/api.js"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/jquery-ui.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/parsley.min.js') }}"></script>
     <script type="text/javascript"