From a4cbabc533c70e978daadb52420622d60b893cbe Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 1 Jun 2014 13:34:41 -0400 Subject: [PATCH] Revert fix for bug #4415 that was not in this branch Signed-off-by: Marc Delisle --- ChangeLog | 1 - js/tbl_change.js | 33 +-------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3691a90156..4eded4e04f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,6 @@ phpMyAdmin - ChangeLog - bug #4396 Problem copying constraints (such as Sakila) - bug #4433 Missing privileges submenu - bug #4394 Drop db confirmation message when dropping a user -- bug #4415 prompts about leaving the page after updating row data from browse tab 4.2.2.0 (2014-05-20) - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree diff --git a/js/tbl_change.js b/js/tbl_change.js index af6ef5f665..b95efc48ef 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -237,8 +237,6 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType) * Unbind all event handlers before tearing down a page */ AJAX.registerTeardown('tbl_change.js', function () { - $("a").die('click'); - $("form#insertForm :input:not([type=hidden])").unbind('change'); $('span.open_gis_editor').die('click'); $("input[name='gis_data[save]']").die('click'); $('input.checkbox_null').die('click'); @@ -247,7 +245,6 @@ AJAX.registerTeardown('tbl_change.js', function () { $("select[name*='funcs']").die('click'); }); - /** * Ajax handlers for Change Table page * @@ -258,35 +255,6 @@ AJAX.registerTeardown('tbl_change.js', function () { AJAX.registerOnload('tbl_change.js', function () { $.datepicker.initialized = false; - // State of the form - var $unsavedForm = false; - - /** - * If user navigates away from the page - * without saving the changes, a prompt - * will be displayed to confirm navigation - */ - $('a').on('click', function(e){ - e.preventDefault(); - - if ($unsavedForm) { - var is_confirmed = confirm(PMA_messages.strConfirmNavigation); - if (! is_confirmed) { - return false; - } else { - unsavedForm = false; - return true; - } - } - }); - - /** - * If any form elements are changed, set $unsavedForm to true - */ - $("form#insertForm :input:not([type=hidden])").change(function(){ - $unsavedForm = true; - }); - $('span.open_gis_editor').live('click', function (event) { event.preventDefault(); @@ -335,6 +303,7 @@ AJAX.registerOnload('tbl_change.js', function () { ); }); + /** * Reset the auto_increment column to 0 when selecting any of the * insert options in submit_type-dropdown. Only perform the reset