From 1b66afcb821f975c871be0567103fac0d1c1230f Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 19 Oct 2010 01:06:30 +0200 Subject: [PATCH] Disable repetitive events as soon as possible --- adminer/static/editing.js | 6 +++--- adminer/static/functions.js | 4 ++-- editor/include/adminer.inc.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adminer/static/editing.js b/adminer/static/editing.js index 99c10569..b03a414c 100644 --- a/adminer/static/editing.js +++ b/adminer/static/editing.js @@ -285,6 +285,7 @@ function partitionNameChange(el) { * @param HTMLSelectElement */ function foreignAddRow(field) { + field.onchange = function () { }; var row = field.parentNode.parentNode.cloneNode(true); var selects = row.getElementsByTagName('select'); for (var i=0; i < selects.length; i++) { @@ -292,7 +293,6 @@ function foreignAddRow(field) { selects[i].selectedIndex = 0; } field.parentNode.parentNode.parentNode.appendChild(row); - field.onchange = function () { }; } @@ -301,6 +301,7 @@ function foreignAddRow(field) { * @param HTMLSelectElement */ function indexesAddRow(field) { + field.onchange = function () { }; var row = field.parentNode.parentNode.cloneNode(true); var spans = row.getElementsByTagName('span'); for (var i=0; i < spans.length - 1; i++) { @@ -315,13 +316,13 @@ function indexesAddRow(field) { input.name = input.name.replace(/indexes\[[0-9]+/, '$&1'); input.value = ''; field.parentNode.parentNode.parentNode.appendChild(row); - field.onchange = function () { }; } /** Add column for index * @param HTMLSelectElement */ function indexesAddColumn(field) { + field.onchange = function () { }; var column = field.parentNode.cloneNode(true); var select = column.getElementsByTagName('select')[0]; select.name = select.name.replace(/\]\[[0-9]+/, '$&1'); @@ -330,7 +331,6 @@ function indexesAddColumn(field) { input.name = input.name.replace(/\]\[[0-9]+/, '$&1'); input.value = ''; field.parentNode.parentNode.appendChild(column); - field.onchange = function () { }; } diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 1581cfbd..f8478a00 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -105,6 +105,7 @@ function setHtml(id, html) { * @param HTMLSelectElement */ function selectAddRow(field) { + field.onchange = function () { }; var row = field.parentNode.cloneNode(true); var selects = row.getElementsByTagName('select'); for (var i=0; i < selects.length; i++) { @@ -118,7 +119,6 @@ function selectAddRow(field) { inputs[0].className = ''; } field.parentNode.parentNode.appendChild(row); - field.onchange = function () { }; } @@ -159,6 +159,7 @@ function textareaKeydown(target, event, tab, button) { * @param boolean display textarea instead of input */ function selectDblClick(td, event, text) { + td.ondblclick = function () { }; var pos = event.rangeOffset; var value = (td.firstChild.firstChild ? td.firstChild.firstChild.data : (td.firstChild.alt ? td.firstChild.alt : td.firstChild.data)); var input = document.createElement(text ? 'textarea' : 'input'); @@ -193,5 +194,4 @@ function selectDblClick(td, event, text) { range.moveStart('character', pos); range.select(); } - td.ondblclick = function () { }; } diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index ac99cc5b..71209989 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -271,7 +271,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5 echo lang('Subject') . ": \n"; echo "


\n"; echo html_select("email_addition", $columns, $_POST["email_addition"]) . "\n"; //! JavaScript - echo "

" . lang('Attachments') . ": "; + echo "

" . lang('Attachments') . ": "; echo "

" . (count($emailFields) == 1 ? '' : html_select("email_field", $emailFields)); echo "\n"; echo "\n";