#190206 by myself: move misplaced Javascript codes from the form definition to where the form is output

1 files changed, 15 insertions, 15 deletions

diff --git a/install.php b/install.php
index 0b91fee33..955c2b50b 100644
--- a/install.php
+++ b/install.php
@@ -664,6 +664,21 @@ function install_tasks($profile, $task) {
 
     drupal_process_form('install_configure_form', $form, $form_state);
     if (empty($form_state['redirect'])) {
+      // Add JavaScript validation for form.
+      _user_password_dynamic_validation();
+      drupal_add_js(drupal_get_path('module', 'system') .'/system.js', 'module');
+      // We add these strings as settings because JavaScript translation does not
+      // work on install time.
+      drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail')), 'cleanURL' => array('success' => st('Your server has been successfully tested to support this feature.'), 'failure' => st('Your system configuration does not currently support this feature. The <a href="http://drupal.org/node/15365">handbook page on Clean URLs</a> has additional troubleshooting information.'), 'testing' => st('Testing clean URLs...'))), 'setting');
+      drupal_add_js('
+// Global Killswitch
+if (Drupal.jsEnabled) {
+  $(document).ready(function() {
+    Drupal.cleanURLsInstallCheck();
+    Drupal.setDefaultTimezone();
+  });
+}', 'inline');
+
       // Build menu to allow clean URL check.
       menu_rebuild();
       $output = drupal_render_form('install_configure_form', $form);
@@ -844,8 +859,6 @@ function install_configure_form() {
   // This is necessary to add the task to the $_GET args so the install
   // system will know that it is done and we've taken over.
 
-  _user_password_dynamic_validation();
-
   $form['intro'] = array(
     '#value' => st('To configure your website, please provide the following information.'),
     '#weight' => -10,
@@ -917,19 +930,6 @@ function install_configure_form() {
     '#weight' => 5,
   );
 
-  drupal_add_js(drupal_get_path('module', 'system') .'/system.js', 'module');
-  // We add these strings as settings because JavaScript translation does not
-  // work on install time.
-  drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail')), 'cleanURL' => array('success' => st('Your server has been successfully tested to support this feature.'), 'failure' => st('Your system configuration does not currently support this feature. The <a href="http://drupal.org/node/15365">handbook page on Clean URLs</a> has additional troubleshooting information.'), 'testing' => st('Testing clean URLs...'))), 'setting');
-  drupal_add_js('
-// Global Killswitch
-if (Drupal.jsEnabled) {
-  $(document).ready(function() {
-    Drupal.cleanURLsInstallCheck();
-    Drupal.setDefaultTimezone();
-  });
-}', 'inline');
-
   $form['server_settings']['clean_url'] = array(
     '#type' => 'radios',
     '#title' => st('Clean URLs'),