From c601027d8fca1c5c871c22a99ed6f95839bee6a8 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 12 Jun 2013 14:22:01 +1200 Subject: [PATCH] Revert "MDL-38555 forms: Prevent same data submission multiple times." This reverts commit 9f2f313e9f7c88eab154450de394c2451f530f58. --- lib/form/submit.js | 9 --------- lib/form/submit.php | 20 -------------------- lib/formslib.php | 2 -- 3 files changed, 31 deletions(-) delete mode 100644 lib/form/submit.js diff --git a/lib/form/submit.js b/lib/form/submit.js deleted file mode 100644 index 6287f16d896..00000000000 --- a/lib/form/submit.js +++ /dev/null @@ -1,9 +0,0 @@ -M.form_submit = {}; - -M.form_submit.init = function(Y, options) { - Y.on('submit', function(e) { - if (!containsErrors) { - e.target.one('#'+options.submitid).setAttribute('disabled', 'true'); - } - }, '#'+options.formid); -}; \ No newline at end of file diff --git a/lib/form/submit.php b/lib/form/submit.php index 0764722cf4e..af94e4f6872 100644 --- a/lib/form/submit.php +++ b/lib/form/submit.php @@ -38,9 +38,6 @@ require_once("HTML/QuickForm/submit.php"); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class MoodleQuickForm_submit extends HTML_QuickForm_submit { - /** @var string Need to store id of form for submission control in JS*/ - var $_formid = ''; - /** * constructor * @@ -63,7 +60,6 @@ class MoodleQuickForm_submit extends HTML_QuickForm_submit { { switch ($event) { case 'createElement': - $this->_formid = $caller->getAttribute('id'); parent::onQuickFormEvent($event, $arg, $caller); if ($caller->isNoSubmitButton($arg[0])){ //need this to bypass client validation @@ -102,20 +98,4 @@ class MoodleQuickForm_submit extends HTML_QuickForm_submit { $this->_flagFrozen = true; } - /** - * Returns HTML for this form element. - * - * @return string - */ - function toHtml(){ - global $PAGE; - $options = array( - 'submitid' => $this->getAttribute('id'), - 'formid' => $this->_formid, - ); - $str = parent::toHtml(); - $module = array('name'=>'form_submit', 'fullpath'=>'/lib/form/submit.js'); - $PAGE->requires->js_init_call('M.form_submit.init', array($options), true, $module); - return $str; - } } diff --git a/lib/formslib.php b/lib/formslib.php index 8f12d6aeea0..22362f8826c 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -2096,7 +2096,6 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless { //_formName . '(frm) { var frm = document.getElementById(\''. $this->_attributes['id'] .'\') var first_focus = false; ' . $validateJS . '; - containsErrors = !ret; return ret; } //]]>