Cleaned up some js in the installer

git-svn-id: http://code.elgg.org/elgg/trunk@8468 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/installation/forms/install/template.php b/views/installation/forms/install/template.php
index 5e44d928e524cfbc078938848133b3537a167120..7e7a668d3804b8fcb27a1690c96ed9df9d334508 100644 (file)
--- a/views/installation/forms/install/template.php
+++ b/views/installation/forms/install/template.php
@@ -30,14 +30,17 @@ $form_body .= elgg_view('input/submit', $submit_params);
 echo $form_body;
 
 ?>
-<?php //@todo JS 1.8: no ?>
+
 <script type="text/javascript">
-       var was_submitted = false;
-       function elggCheckFormSubmission() {
-               if (was_submitted == false) {
-                       was_submitted = true;
+       //prevent double-submission
+       $(function() {
+               $('form').submit(function() {
+                       if (this.data('submitted')) {
+                               return false;
+                       }
+
+                       this.data('submitted', true);
                        return true;
                }
-               return false;
-       }
+       });
 </script>

diff --git a/views/installation/install/pages/admin.php b/views/installation/install/pages/admin.php
index c9d244416c5b02dbecb87895aad13ea758e10348..9456e682f54dbdcf090d8e615af5322883c6edc6 100644 (file)
--- a/views/installation/install/pages/admin.php
+++ b/views/installation/install/pages/admin.php
@@ -12,7 +12,6 @@ $url = current_page_url();
 $form_vars = array(
        'action' => $url,
        'disable_security' => TRUE,
-       'onsubmit' => 'return elggCheckFormSubmission()',
 );
 
 echo elgg_view_form('install/template', $form_vars, $vars);

diff --git a/views/installation/install/pages/database.php b/views/installation/install/pages/database.php
index 003571232e3935638cca20fefcbdb8ff9bda8e33..d3011c9e3e3c7cbad5bdf6d944257adb94f60db4 100644 (file)
--- a/views/installation/install/pages/database.php
+++ b/views/installation/install/pages/database.php
@@ -20,7 +20,6 @@ if (isset($vars['failure']) && $vars['failure']) {
        $form_vars = array(
                'action' => $url,
                'disable_security' => TRUE,
-               'onsubmit' => 'return elggCheckFormSubmission()',
        );
        
        echo elgg_view_form('install/template', $form_vars, $vars);

diff --git a/views/installation/install/pages/settings.php b/views/installation/install/pages/settings.php
index d1fd0a9ffd43ba078835956b22dd90e02f2592f6..30a1deb5a8b64c6bb1ab408010e544ddef73ac1c 100644 (file)
--- a/views/installation/install/pages/settings.php
+++ b/views/installation/install/pages/settings.php
@@ -9,7 +9,6 @@ $url = current_page_url();
 $form_vars = array(
        'action' => $url,
        'disable_security' => TRUE,
-       'onsubmit' => 'return elggCheckFormSubmission()',
 );
 
 echo elgg_view_form('install/template', $form_vars, $vars);