Replace .click() with .on()

.click() event shorthand is deprecated

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>

26 files changed, 179 insertions, 179 deletions

diff --git a/js/common.js b/js/common.js
index 171df0795f..026b973321 100644
--- a/js/common.js
+++ b/js/common.js
@@ -153,7 +153,7 @@ var PMA_commonActions = {
         url += PMA_commonParams.getUrlQuery();
         $('<a />', { href: url })
             .appendTo('body')
-            .click()
+            .trigger('click')
             .remove();
         AJAX._callback = callback;
     }
diff --git a/js/config.js b/js/config.js
index cd69c0dc52..dc23f7a6e8 100644
--- a/js/config.js
+++ b/js/config.js
@@ -590,7 +590,7 @@ function setupConfigTabs () {
         // add tabs events and activate one tab (the first one or indicated by location hash)
         $tabs.find('li').removeClass('active');
         $tabs.find('a')
-            .click(function (e) {
+            .on('click', function (e) {
                 e.preventDefault();
                 setTab($(this).attr('href').substr(1));
             })
@@ -722,7 +722,7 @@ AJAX.registerOnload('config.js', function () {
     $radios
         .prop('disabled', false)
         .add('#export_text_file, #import_text_file')
-        .click(function () {
+        .on('click', function () {
             var enable_id = $(this).attr('id');
             var disable_id;
             if (enable_id.match(/local_storage$/)) {
@@ -836,7 +836,7 @@ function offerPrefsAutoimport () {
     if (!$cnt.length || !has_config) {
         return;
     }
-    $cnt.find('a').click(function (e) {
+    $cnt.find('a').on('click', function (e) {
         e.preventDefault();
         var $a = $(this);
         if ($a.attr('href') === '#no') {
diff --git a/js/console.js b/js/console.js
index cb19b5724d..36c053c477 100644
--- a/js/console.js
+++ b/js/console.js
@@ -110,45 +110,45 @@ var PMA_console = {
             PMA_consoleBookmarks.initialize();
             PMA_consoleDebug.initialize();
 
-            PMA_console.$consoleToolbar.children('.console_switch').click(PMA_console.toggle);
+            PMA_console.$consoleToolbar.children('.console_switch').on('click', PMA_console.toggle);
 
             $('#pma_console').find('.toolbar').children().mousedown(function (event) {
                 event.preventDefault();
                 event.stopImmediatePropagation();
             });
 
-            $('#pma_console').find('.button.clear').click(function () {
+            $('#pma_console').find('.button.clear').on('click', function () {
                 PMA_consoleMessages.clear();
             });
 
-            $('#pma_console').find('.button.history').click(function () {
+            $('#pma_console').find('.button.history').on('click', function () {
                 PMA_consoleMessages.showHistory();
             });
 
-            $('#pma_console').find('.button.options').click(function () {
+            $('#pma_console').find('.button.options').on('click', function () {
                 PMA_console.showCard('#pma_console_options');
             });
 
-            $('#pma_console').find('.button.debug').click(function () {
+            $('#pma_console').find('.button.debug').on('click', function () {
                 PMA_console.showCard('#debug_console');
             });
 
-            PMA_console.$consoleContent.click(function (event) {
+            PMA_console.$consoleContent.on('click', function (event) {
                 if (event.target === this) {
                     PMA_consoleInput.focus();
                 }
             });
 
-            $('#pma_console').find('.mid_layer').click(function () {
+            $('#pma_console').find('.mid_layer').on('click', function () {
                 PMA_console.hideCard($(this).parent().children('.card'));
             });
-            $('#debug_console').find('.switch_button').click(function () {
+            $('#debug_console').find('.switch_button').on('click', function () {
                 PMA_console.hideCard($(this).closest('.card'));
             });
-            $('#pma_bookmarks').find('.switch_button').click(function () {
+            $('#pma_bookmarks').find('.switch_button').on('click', function () {
                 PMA_console.hideCard($(this).closest('.card'));
             });
-            $('#pma_console_options').find('.switch_button').click(function () {
+            $('#pma_console_options').find('.switch_button').on('click', function () {
                 PMA_console.hideCard($(this).closest('.card'));
             });
 
@@ -156,7 +156,7 @@ var PMA_console = {
                 PMA_console.updateConfig();
             });
 
-            $('#pma_console_options').find('.button.default').click(function () {
+            $('#pma_console_options').find('.button.default').on('click', function () {
                 $('#pma_console_options input[name=always_expand]').prop('checked', false);
                 $('#pma_console_options').find('input[name=start_history]').prop('checked', false);
                 $('#pma_console_options').find('input[name=current_query]').prop('checked', true);
@@ -741,7 +741,7 @@ var PMA_consoleMessages = {
     clear: function () {
         $('#pma_console').find('.content .console_message_container .message:not(.welcome)').addClass('hide');
         $('#pma_console').find('.content .console_message_container .message.failed').remove();
-        $('#pma_console').find('.content .console_message_container .message.expanded').find('.action.collapse').click();
+        $('#pma_console').find('.content .console_message_container .message.expanded').find('.action.collapse').trigger('click');
     },
     /**
      * Used for show history messages
@@ -863,19 +863,19 @@ var PMA_consoleMessages = {
         }
         $targetMessage.addClass('binded');
 
-        $targetMessage.find('.action.expand').click(function () {
+        $targetMessage.find('.action.expand').on('click', function () {
             $(this).closest('.message').removeClass('collapsed');
             $(this).closest('.message').addClass('expanded');
         });
-        $targetMessage.find('.action.collapse').click(function () {
+        $targetMessage.find('.action.collapse').on('click', function () {
             $(this).closest('.message').addClass('collapsed');
             $(this).closest('.message').removeClass('expanded');
         });
-        $targetMessage.find('.action.edit').click(function () {
+        $targetMessage.find('.action.edit').on('click', function () {
             PMA_consoleInput.setText($(this).parent().siblings('.query').text());
             PMA_consoleInput.focus();
         });
-        $targetMessage.find('.action.requery').click(function () {
+        $targetMessage.find('.action.requery').on('click', function () {
             var query = $(this).parent().siblings('.query').text();
             var $message = $(this).closest('.message');
             if (confirm(PMA_messages.strConsoleRequeryConfirm + '\n' +
@@ -884,13 +884,13 @@ var PMA_consoleMessages = {
                 PMA_console.execute(query, { db: $message.attr('targetdb'), table: $message.attr('targettable') });
             }
         });
-        $targetMessage.find('.action.bookmark').click(function () {
+        $targetMessage.find('.action.bookmark').on('click', function () {
             var query = $(this).parent().siblings('.query').text();
             var $message = $(this).closest('.message');
             PMA_consoleBookmarks.addBookmark(query, $message.attr('targetdb'));
             PMA_console.showCard('#pma_bookmarks .card.add');
         });
-        $targetMessage.find('.action.edit_bookmark').click(function () {
+        $targetMessage.find('.action.edit_bookmark').on('click', function () {
             var query = $(this).parent().siblings('.query').text();
             var $message = $(this).closest('.message');
             var isShared = $message.find('span.bookmark_label').hasClass('shared');
@@ -898,7 +898,7 @@ var PMA_consoleMessages = {
             PMA_consoleBookmarks.addBookmark(query, $message.attr('targetdb'), label, isShared);
             PMA_console.showCard('#pma_bookmarks .card.add');
         });
-        $targetMessage.find('.action.delete_bookmark').click(function () {
+        $targetMessage.find('.action.delete_bookmark').on('click', function () {
             var $message = $(this).closest('.message');
             if (confirm(PMA_messages.strConsoleDeleteBookmarkConfirm + '\n' + $message.find('.bookmark_label').text())) {
                 $.post('import.php',
@@ -912,20 +912,20 @@ var PMA_consoleMessages = {
                     });
             }
         });
-        $targetMessage.find('.action.profiling').click(function () {
+        $targetMessage.find('.action.profiling').on('click', function () {
             var $message = $(this).closest('.message');
             PMA_console.execute($(this).parent().siblings('.query').text(),
                 { db: $message.attr('targetdb'),
                     table: $message.attr('targettable'),
                     profiling: true });
         });
-        $targetMessage.find('.action.explain').click(function () {
+        $targetMessage.find('.action.explain').on('click', function () {
             var $message = $(this).closest('.message');
             PMA_console.execute('EXPLAIN ' + $(this).parent().siblings('.query').text(),
                 { db: $message.attr('targetdb'),
                     table: $message.attr('targettable') });
         });
-        $targetMessage.find('.action.dbg_show_trace').click(function () {
+        $targetMessage.find('.action.dbg_show_trace').on('click', function () {
             var $message = $(this).closest('.message');
             if (!$message.find('.trace').length) {
                 PMA_consoleDebug.getQueryDetails(
@@ -938,17 +938,17 @@ var PMA_consoleMessages = {
             $message.addClass('show_trace');
             $message.removeClass('hide_trace');
         });
-        $targetMessage.find('.action.dbg_hide_trace').click(function () {
+        $targetMessage.find('.action.dbg_hide_trace').on('click', function () {
             var $message = $(this).closest('.message');
             $message.addClass('hide_trace');
             $message.removeClass('show_trace');
         });
-        $targetMessage.find('.action.dbg_show_args').click(function () {
+        $targetMessage.find('.action.dbg_show_args').on('click', function () {
             var $message = $(this).closest('.message');
             $message.addClass('show_args expanded');
             $message.removeClass('hide_args collapsed');
         });
-        $targetMessage.find('.action.dbg_hide_args').click(function () {
+        $targetMessage.find('.action.dbg_hide_args').on('click', function () {
             var $message = $(this).closest('.message');
             $message.addClass('hide_args collapsed');
             $message.removeClass('show_args expanded');
@@ -1057,13 +1057,13 @@ var PMA_consoleBookmarks = {
         if ($('#pma_bookmarks').length === 0) {
             return;
         }
-        $('#pma_console').find('.button.bookmarks').click(function () {
+        $('#pma_console').find('.button.bookmarks').on('click', function () {
             PMA_console.showCard('#pma_bookmarks');
         });
-        $('#pma_bookmarks').find('.button.add').click(function () {
+        $('#pma_bookmarks').find('.button.add').on('click', function () {
             PMA_console.showCard('#pma_bookmarks .card.add');
         });
-        $('#pma_bookmarks').find('.card.add [name=submit]').click(function () {
+        $('#pma_bookmarks').find('.card.add [name=submit]').on('click', function () {
             if ($('#pma_bookmarks').find('.card.add [name=label]').val().length === 0
                 || PMA_consoleInput.getText('bookmark').length === 0) {
                 alert(PMA_messages.strFormEmpty);
@@ -1085,7 +1085,7 @@ var PMA_consoleBookmarks = {
                     PMA_console.hideCard($('#pma_bookmarks').find('.card.add'));
                 });
         });
-        $('#pma_console').find('.button.refresh').click(function () {
+        $('#pma_console').find('.button.refresh').on('click', function () {
             PMA_consoleBookmarks.refresh();
         });
     }
@@ -1124,7 +1124,7 @@ PMA_consoleDebug = {
         $('#debug_console').find('.button.order.order_' + order).addClass('active');
 
         // Initialize actions in toolbar
-        $('#debug_console').find('.button.group_queries').click(function () {
+        $('#debug_console').find('.button.group_queries').on('click', function () {
             $('#debug_console').addClass('grouped');
             $('#debug_console').removeClass('ungrouped');
             PMA_console.setConfig('GroupQueries', true);
@@ -1133,7 +1133,7 @@ PMA_consoleDebug = {
                 $('#debug_console').find('.button.order_by.sort_exec').removeClass('active');
             }
         });
-        $('#debug_console').find('.button.ungroup_queries').click(function () {
+        $('#debug_console').find('.button.ungroup_queries').on('click', function () {
             $('#debug_console').addClass('ungrouped');
             $('#debug_console').removeClass('grouped');
             PMA_console.setConfig('GroupQueries', false);
@@ -1142,7 +1142,7 @@ PMA_consoleDebug = {
                 $('#debug_console').find('.button.order_by.sort_exec').addClass('active');
             }
         });
-        $('#debug_console').find('.button.order_by').click(function () {
+        $('#debug_console').find('.button.order_by').on('click', function () {
             var $this = $(this);
             $('#debug_console').find('.button.order_by').removeClass('active');
             $this.addClass('active');
@@ -1155,7 +1155,7 @@ PMA_consoleDebug = {
             }
             PMA_consoleDebug.refresh();
         });
-        $('#debug_console').find('.button.order').click(function () {
+        $('#debug_console').find('.button.order').on('click', function () {
             var $this = $(this);
             $('#debug_console').find('.button.order').removeClass('active');
             $this.addClass('active');
diff --git a/js/db_central_columns.js b/js/db_central_columns.js
index 421c46b967..44f8e11b36 100644
--- a/js/db_central_columns.js
+++ b/js/db_central_columns.js
@@ -46,7 +46,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
             }
         });
     }
-    $('#tableslistcontainer').find('button[name="delete_central_columns"]').click(function (event) {
+    $('#tableslistcontainer').find('button[name="delete_central_columns"]').on('click', function (event) {
         event.preventDefault();
         var multi_delete_columns = $('.checkall:checkbox:checked').serialize();
         if (multi_delete_columns === '') {
@@ -57,7 +57,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
         $('#del_col_name').val(multi_delete_columns);
         $('#del_form').submit();
     });
-    $('#tableslistcontainer').find('button[name="edit_central_columns"]').click(function (event) {
+    $('#tableslistcontainer').find('button[name="edit_central_columns"]').on('click', function (event) {
         event.preventDefault();
         var editColumnList = $('.checkall:checkbox:checked').serialize();
         if (editColumnList === '') {
@@ -98,7 +98,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
         }).get();
         $.uiTableFilter($('#table_columns'), $(this).val(), cols, null, 'td span');
     });
-    $('.edit').click(function () {
+    $('.edit').on('click', function () {
         var rownum = $(this).parent().data('rownum');
         $('#save_' + rownum).show();
         $(this).hide();
@@ -112,7 +112,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
             $('#f_' + rownum + ' .default_type').siblings('.default_value').hide();
         }
     });
-    $('.del_row').click(function (event) {
+    $('.del_row').on('click', function (event) {
         event.preventDefault();
         event.stopPropagation();
         var $td = $(this);
@@ -123,7 +123,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
             $('#del_form').submit();
         });
     });
-    $('.edit_cancel_form').click(function (event) {
+    $('.edit_cancel_form').on('click', function (event) {
         event.preventDefault();
         event.stopPropagation();
         var rownum = $(this).data('rownum');
@@ -133,7 +133,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
         $('#f_' + rownum + ' input, #f_' + rownum + ' select,#f_' + rownum + ' .default_value, #f_' + rownum + ' .open_enum_editor').hide();
         $('#tableslistcontainer').find('.checkall').show();
     });
-    $('.edit_save_form').click(function (event) {
+    $('.edit_save_form').on('click', function (event) {
         event.preventDefault();
         event.stopPropagation();
         var rownum = $(this).data('rownum');
@@ -216,7 +216,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
             e.stopPropagation();
         }
     });
-    $('#add_col_div').find('>a').click(function (event) {
+    $('#add_col_div').find('>a').on('click', function (event) {
         $('#add_new').slideToggle('slow');
         var $addColDivLinkSpan = $('#add_col_div').find('>a span');
         if ($addColDivLinkSpan.html() === '+') {
diff --git a/js/db_multi_table_query.js b/js/db_multi_table_query.js
index 33b0b0fd68..5f0451b416 100644
--- a/js/db_multi_table_query.js
+++ b/js/db_multi_table_query.js
@@ -185,7 +185,7 @@ AJAX.registerOnload('db_multi_table_query.js', function () {
                     });
                 });
                 $('#sql_results').html($results_dom);
-                $('#page_content').find('a').first().click();
+                $('#page_content').find('a').first().trigger('click');
             }
         });
     });
diff --git a/js/db_search.js b/js/db_search.js
index c1c5dd6b2b..66f7c6287e 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -34,7 +34,7 @@ AJAX.registerOnload('db_search.js', function () {
     $('#table-info').prepend(icon).hide();
 
     /** Hide the browse and deleted results in the new search criteria */
-    $('#buttonGo').click(function () {
+    $('#buttonGo').on('click', function () {
         $('#table-info').hide();
         $('#browse-results').hide();
         $('#sqlqueryform').hide();
@@ -183,7 +183,7 @@ AJAX.registerOnload('db_search.js', function () {
 
                 $('#sqlqueryform').html(data.sql_query);
                 /** Refresh the search results after the deletion */
-                document.getElementById('buttonGo').click();
+                document.getElementById('buttonGo').trigger('click');
                 $('#togglequerybox').html(PMA_messages.strHideQueryBox);
                 /** Show the results of the deletion option */
                 $('#browse-results').hide();
diff --git a/js/db_structure.js b/js/db_structure.js
index a847876887..95e72323fe 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -147,7 +147,7 @@ function PMA_fetchRealRowCount ($target) {
         .first()
         .clone()
         .css({ visibility: 'visible', display: 'inline-block' })
-        .click(false);
+        .on('click', false);
     $target.html($throbber);
     $.ajax({
         type: 'GET',
diff --git a/js/designer/history.js b/js/designer/history.js
index a5f957814c..6aaefbe80b 100644
--- a/js/designer/history.js
+++ b/js/designer/history.js
@@ -839,16 +839,16 @@ AJAX.registerTeardown('designer/history.js', function () {
 });
 
 AJAX.registerOnload('designer/history.js', function () {
-    $('#ok_edit_rename').click(function () {
+    $('#ok_edit_rename').on('click', function () {
         edit('Rename');
     });
-    $('#ok_edit_having').click(function () {
+    $('#ok_edit_having').on('click', function () {
         edit('Having');
     });
-    $('#ok_edit_Aggr').click(function () {
+    $('#ok_edit_Aggr').on('click', function () {
         edit('Aggregate');
     });
-    $('#ok_edit_where').click(function () {
+    $('#ok_edit_where').on('click', function () {
         edit('Where');
     });
     $('#ab').accordion({ collapsible : true, active : 'none' });
diff --git a/js/designer/init.js b/js/designer/init.js
index 4292069c85..640b49e608 100644
--- a/js/designer/init.js
+++ b/js/designer/init.js
@@ -17,7 +17,7 @@ AJAX.registerTeardown('designer/init.js', function () {
 });
 
 AJAX.registerOnload('designer/init.js', function () {
-    $('.trigger').click(function () {
+    $('.trigger').on('click', function () {
         $('.panel').toggle('fast');
         $(this).toggleClass('active');
         $('#ab').accordion('refresh');
@@ -45,23 +45,23 @@ AJAX.registerOnload('designer/init.js', function () {
         });
     }
 
-    $('#query_Aggregate_Button').click(function () {
+    $('#query_Aggregate_Button').on('click', function () {
         document.getElementById('query_Aggregate').style.display = 'none';
     });
 
-    $('#query_having_button').click(function () {
+    $('#query_having_button').on('click', function () {
         document.getElementById('query_having').style.display = 'none';
     });
 
-    $('#query_rename_to_button').click(function () {
+    $('#query_rename_to_button').on('click', function () {
         document.getElementById('query_rename_to').style.display = 'none';
     });
 
-    $('#build_query_button').click(function () {
+    $('#build_query_button').on('click', function () {
         build_query('SQL Query on Database', 0);
     });
 
-    $('#query_where_button').click(function () {
+    $('#query_where_button').on('click', function () {
         document.getElementById('query_where').style.display = 'none';
     });
 });
diff --git a/js/designer/move.js b/js/designer/move.js
index 93187663c6..31f328d458 100644
--- a/js/designer/move.js
+++ b/js/designer/move.js
@@ -253,14 +253,14 @@ function setDefaultValuesFromSavedState () {
 
     var $key_SB_all = $('#key_SB_all');
     if ($key_SB_all.attr('class') === 'M_butt_Selected_down') {
-        $key_SB_all.click();
+        $key_SB_all.trigger('click');
         $key_SB_all.toggleClass('M_butt_Selected_down');
         $key_SB_all.toggleClass('M_butt');
     }
 
     var $key_Left_Right = $('#key_Left_Right');
     if ($key_Left_Right.attr('class') === 'M_butt_Selected_down') {
-        $key_Left_Right.click();
+        $key_Left_Right.trigger('click');
     }
 }
 
@@ -1124,7 +1124,7 @@ function Load_page (page) {
         }
         $('<a href="db_designer.php?server=' + server + argsep + 'db=' + db + param_page + '"></a>')
             .appendTo($('#page_content'))
-            .click();
+            .trigger('click');
     } else {
         if (page === null) {
             Show_tables_in_landing_page(db);
@@ -1951,81 +1951,81 @@ AJAX.registerTeardown('designer/move.js', function () {
 });
 
 AJAX.registerOnload('designer/move.js', function () {
-    $('#key_Show_left_menu').click(function () {
+    $('#key_Show_left_menu').on('click', function () {
         Show_left_menu(this);
         return false;
     });
-    $('#toggleFullscreen').click(function () {
+    $('#toggleFullscreen').on('click', function () {
         Toggle_fullscreen();
         return false;
     });
-    $('#addOtherDbTables').click(function () {
+    $('#addOtherDbTables').on('click', function () {
         Add_Other_db_tables();
         return false;
     });
-    $('#newPage').click(function () {
+    $('#newPage').on('click', function () {
         New();
         return false;
     });
-    $('#editPage').click(function () {
+    $('#editPage').on('click', function () {
         Edit_pages();
         return false;
     });
-    $('#savePos').click(function () {
+    $('#savePos').on('click', function () {
         Save3();
         return false;
     });
-    $('#SaveAs').click(function () {
+    $('#SaveAs').on('click', function () {
         Save_as();
         return false;
     });
-    $('#delPages').click(function () {
+    $('#delPages').on('click', function () {
         Delete_pages();
         return false;
     });
-    $('#StartTableNew').click(function () {
+    $('#StartTableNew').on('click', function () {
         Start_table_new();
         return false;
     });
-    $('#rel_button').click(function () {
+    $('#rel_button').on('click', function () {
         Start_relation();
         return false;
     });
-    $('#display_field_button').click(function () {
+    $('#display_field_button').on('click', function () {
         Start_display_field();
         return false;
     });
-    $('#reloadPage').click(function () {
-        $('#designer_tab').click();
+    $('#reloadPage').on('click', function () {
+        $('#designer_tab').trigger('click');
     });
-    $('#angular_direct_button').click(function () {
+    $('#angular_direct_button').on('click', function () {
         Angular_direct();
         return false;
     });
-    $('#grid_button').click(function () {
+    $('#grid_button').on('click', function () {
         Grid();
         return false;
     });
-    $('#key_SB_all').click(function () {
+    $('#key_SB_all').on('click', function () {
         Small_tab_all(this);
         return false;
     });
-    $('#SmallTabInvert').click(function () {
+    $('#SmallTabInvert').on('click', function () {
         Small_tab_invert();
         return false;
     });
-    $('#relLineInvert').click(function () {
+    $('#relLineInvert').on('click', function () {
         Relation_lines_invert();
         return false;
     });
-    $('#exportPages').click(function () {
+    $('#exportPages').on('click', function () {
         Export_pages();
         return false;
     });
-    $('#query_builder').click(function () {
+    $('#query_builder').on('click', function () {
         build_query('SQL Query on Database', 0);
     });
-    $('#key_Left_Right').click(function () {
+    $('#key_Left_Right').on('click', function () {
         Side_menu_right(this);
         return false;
     });
@@ -2036,25 +2036,25 @@ AJAX.registerOnload('designer/move.js', function () {
         Hide_text();
         return false;
     });
-    $('#pin_Text').click(function () {
+    $('#pin_Text').on('click', function () {
         Pin_text(this);
         return false;
     });
-    $('#canvas').click(function (event) {
+    $('#canvas').on('click', function (event) {
         Canvas_click(this, event);
     });
-    $('#key_HS_all').click(function () {
+    $('#key_HS_all').on('click', function () {
         Hide_tab_all(this);
         return false;
     });
-    $('#key_HS').click(function () {
+    $('#key_HS').on('click', function () {
         No_have_constr(this);
         return false;
     });
-    $('.scroll_tab_struct').click(function () {
+    $('.scroll_tab_struct').on('click', function () {
         Start_tab_upd($(this).attr('table_name'));
     });
-    $('.scroll_tab_checkbox').click(function () {
+    $('.scroll_tab_checkbox').on('click', function () {
         VisibleTab(this,$(this).val());
     });
     $('#id_scroll_tab').find('tr').on('click', '.designer_Tabs2,.designer_Tabs', function () {
@@ -2093,23 +2093,23 @@ AJAX.registerOnload('designer/move.js', function () {
         var params = ($(this).attr('Click_option_param')).split(',');
         Click_option(params[0], params[1], params[2]);
     });
-    $('input#del_button').click(function () {
+    $('input#del_button').on('click', function () {
         Upd_relation();
     });
-    $('input#cancel_button').click(function () {
+    $('input#cancel_button').on('click', function () {
         document.getElementById('layer_upd_relation').style.display = 'none';
         Re_load();
     });
-    $('input#ok_add_object').click(function () {
+    $('input#ok_add_object').on('click', function () {
         add_object();
     });
-    $('input#cancel_close_option').click(function () {
+    $('input#cancel_close_option').on('click', function () {
         Close_option();
     });
-    $('input#ok_new_rel_panel').click(function () {
+    $('input#ok_new_rel_panel').on('click', function () {
         New_relation();
     });
-    $('input#cancel_new_rel_panel').click(function () {
+    $('input#cancel_new_rel_panel').on('click', function () {
         document.getElementById('layer_new_relation').style.display = 'none';
     });
 });
diff --git a/js/functions.js b/js/functions.js
index 86f298526f..b4351e49b8 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2962,7 +2962,7 @@ AJAX.registerOnload('functions.js', function () {
             $(this)
                 .closest('form')
                 .find('input[name=submit_num_fields]')
-                .click();
+                .trigger('click');
         }
     });
 
@@ -3192,7 +3192,7 @@ AJAX.registerOnload('functions.js', function () {
                     .closest('.ui-dialog')
                     .find('.ui-dialog-buttonpane .ui-button')
                     .first()
-                    .click();
+                    .trigger('click');
             });
         }); // end $.get()
     }); // end handler for change password anchor
@@ -3578,7 +3578,7 @@ AJAX.registerOnload('functions.js', function () {
                 $('.filter_rows').on('keyup', function () {
                     $.uiTableFilter($('#col_list'), $(this).val());
                 });
-                $('#seeMore').click(function () {
+                $('#seeMore').on('click', function () {
                     fields = '';
                     min = (list_size <= maxRows + result_pointer) ? list_size : maxRows + result_pointer;
                     for (i = result_pointer; i < min; i++) {
@@ -3998,7 +3998,7 @@ var toggleButton = function ($obj) {
         }
     }
     // Attach an 'onclick' event to the switch
-    $('div.container', $obj).click(function () {
+    $('div.container', $obj).on('click', function () {
         if ($(this).hasClass('isActive')) {
             return false;
         } else {
@@ -4190,7 +4190,7 @@ function PMA_init_slider () {
             .text($this.attr('title'))
             .prepend($('<span>'))
             .insertBefore($this)
-            .click(function () {
+            .on('click', function () {
                 var $wrapper = $this.closest('.slide-wrapper');
                 var visible = $this.is(':visible');
                 if (!visible) {
@@ -4429,7 +4429,7 @@ AJAX.registerOnload('functions.js', function () {
     /**
      * Theme changer.
      */
-    $('a.take_theme').click(function (e) {
+    $('a.take_theme').on('click', function (e) {
         var what = this.name;
         if (window.opener && window.opener.document.forms.setTheme.elements.set_theme) {
             window.opener.document.forms.setTheme.elements.set_theme.value = what;
@@ -4458,14 +4458,14 @@ function createPrintAndBackButtons () {
         value: PMA_messages.back,
         id: 'back_button_print_view'
     });
-    back_button.click(removePrintAndBackButton);
+    back_button.on('click', removePrintAndBackButton);
     back_button.appendTo('#page_content');
     var print_button = $('<input/>',{
         type: 'button',
         value: PMA_messages.print,
         id: 'print_button_print_view'
     });
-    print_button.click(printPage);
+    print_button.on('click', printPage);
     print_button.appendTo('#page_content');
 }
 
@@ -4498,8 +4498,8 @@ AJAX.registerTeardown('functions.js', function () {
 });
 
 AJAX.registerOnload('functions.js', function () {
-    $('input#print').click(printPage);
-    $('.logout').click(function () {
+    $('input#print').on('click', printPage);
+    $('.logout').on('click', function () {
         var form = $(
             '<form method="POST" action="' + $(this).attr('href') + '" class="disableAjax">' +
             '<input type="hidden" name="token" value="' + escapeHtml(PMA_commonParams.get('token')) + '"/>' +
@@ -4529,7 +4529,7 @@ AJAX.registerOnload('functions.js', function () {
                 // was also prevented in IE
                 $(this).blur();
 
-                $(this).closest('.ui-dialog').find('.ui-button:first').click();
+                $(this).closest('.ui-dialog').find('.ui-button:first').trigger('click');
             }
         }); // end $(document).on()
     }
@@ -4883,7 +4883,7 @@ AJAX.registerOnload('functions.js', function () {
         if ((e.ctrlKey && e.which === 13) || (e.altKey && e.which === 13)) {
             $form = $(this).closest('form');
             if (! $form.find('input[type="submit"]') ||
-                ! $form.find('input[type="submit"]').click()
+                ! $form.find('input[type="submit"]').trigger('click')
             ) {
                 $form.submit();
             }
diff --git a/js/indexes.js b/js/indexes.js
index 19744833c9..4ce50bc60d 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -629,7 +629,7 @@ AJAX.registerOnload('indexes.js', function () {
                         PMA_highlightSQL($('#page_content'));
                     }
                     PMA_commonActions.refreshMain(false, function () {
-                        $('a.ajax[href^=#indexes]').click();
+                        $('a.ajax[href^=#indexes]').trigger('click');
                     });
                     PMA_reloadNavigation();
                 } else {
@@ -670,7 +670,7 @@ AJAX.registerOnload('indexes.js', function () {
         indexEditorDialog(url, title, function () {
             // refresh the page using ajax
             PMA_commonActions.refreshMain(false, function () {
-                $('a.ajax[href^=#indexes]').click();
+                $('a.ajax[href^=#indexes]').trigger('click');
             });
         });
     });
diff --git a/js/makegrid.js b/js/makegrid.js
index 6dda16838c..e44526a8fe 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -825,7 +825,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                     }
 
                     // if null checkbox is clicked empty the corresponding select/editor.
-                    $checkbox.click(function () {
+                    $checkbox.on('click', function () {
                         if ($td.is('.enum')) {
                             $editArea.find('select').val('');
                         } else if ($td.is('.set')) {
@@ -1073,7 +1073,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                     $(g.cEdit).append(datepicker_div);
 
                     // cancel any click on the datepicker element
-                    $editArea.find('> *').click(function (e) {
+                    $editArea.find('> *').on('click', function (e) {
                         e.stopPropagation();
                     });
 
@@ -1623,7 +1623,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                     e.stopPropagation();
                 });
             // restore column order when the restore button is clicked
-            $(g.o).find('div.restore_column').click(function () {
+            $(g.o).find('div.restore_column').on('click', function () {
                 g.restoreColOrder();
             });
 
@@ -1690,7 +1690,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                     var cd = document.createElement('div'); // column drop-down arrow
                     var pos = $th.position();
                     $(cd).addClass('coldrop')
-                        .click(function () {
+                        .on('click', function () {
                             if (g.cList.style.display === 'none') {
                                 g.showColList(this);
                             } else {
@@ -1717,21 +1717,21 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                         .prepend('<input type="checkbox" ' + (g.colVisib[i] ? 'checked="checked" ' : '') + '/>');
                     $listDiv.append(listElmt);
                     // add event on click
-                    $(listElmt).click(tempClick);
+                    $(listElmt).on('click', tempClick);
                 }
                 // add "show all column" button
                 var showAll = document.createElement('div');
                 $(showAll).addClass('showAllColBtn')
                     .text(g.showAllColText);
                 $(g.cList).append(showAll);
-                $(showAll).click(function () {
+                $(showAll).on('click', function () {
                     g.showAllColumns();
                 });
                 // prepend "show all column" button at top if the list is too long
                 if ($firstRowCols.length > 10) {
                     var clone = showAll.cloneNode(true);
                     $(g.cList).prepend(clone);
-                    $(clone).click(function () {
+                    $(clone).on('click', function () {
                         g.showAllColumns();
                     });
                 }
@@ -1979,7 +1979,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
 
             // register events
             $(g.t).find('td.data.click1')
-                .click(function (e) {
+                .on('click', function (e) {
                     startGridEditing(e, this);
                     // prevent default action when clicking on "link" in a table
                     if ($(e.target).is('.grid_edit a')) {
@@ -1988,7 +1988,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                 });
 
             $(g.t).find('td.data.click2')
-                .click(function (e) {
+                .on('click', function (e) {
                     var $cell = $(this);
                     // In the case of relational link, We want single click on the link
                     // to goto the link and double click to start grid-editing.
@@ -2067,7 +2067,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                     e.preventDefault();
                 }
             });
-            $('html').click(function (e) {
+            $('html').on('click', function (e) {
                 // hide edit cell if the click is not fromDat edit area
                 if ($(e.target).parents().index($(g.cEdit)) === -1 &&
                     !$(e.target).parents('.ui-datepicker-header').length &&
@@ -2082,7 +2082,7 @@ function PMA_makegrid (t, enableResize, enableReorder, enableVisib, enableGridEd
                     g.hideEditCell(true);
                 }
             });
-            $(g.o).find('div.save_edited').click(function () {
+            $(g.o).find('div.save_edited').on('click', function () {
                 g.hideEditCell();
                 g.postEditedCell();
             });
diff --git a/js/navigation.js b/js/navigation.js
index 7b95fec91b..3168b25041 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -341,7 +341,7 @@ $(function () {
         $('#pma_navigation_tree').find('a.expander').each(function () {
             var $icon = $(this).find('img');
             if ($icon.is('.ic_b_minus')) {
-                $(this).click();
+                $(this).trigger('click');
             }
         });
     });
@@ -678,7 +678,7 @@ function expandTreeNode ($expandElem, callback) {
             .first()
             .clone()
             .css({ visibility: 'visible', display: 'block' })
-            .click(false);
+            .on('click', false);
         $icon.hide();
         $throbber.insertBefore($icon);
 
@@ -691,7 +691,7 @@ function expandTreeNode ($expandElem, callback) {
                 if ($destination.find('ul > li').length === 1) {
                     $destination.find('ul > li')
                         .find('a.expander.container')
-                        .click();
+                        .trigger('click');
                 }
                 if (callback && typeof callback === 'function') {
                     callback.call();
@@ -829,7 +829,7 @@ function PMA_showCurrentNavigation () {
                             $(this)
                                 .children('div:first')
                                 .children('a.expander')
-                                .click();
+                                .trigger('click');
                         }
                     });
                     ret = $li;
diff --git a/js/normalization.js b/js/normalization.js
index 8c2aa81d90..41de567f29 100644
--- a/js/normalization.js
+++ b/js/normalization.js
@@ -215,7 +215,7 @@ function goTo2NFFinish (pd) {
             if (data.success === true) {
                 if (data.queryError === false) {
                     if (normalizeto === '3nf') {
-                        $('#pma_navigation_reload').click();
+                        $('#pma_navigation_reload').trigger('click');
                         goTo3NFStep1(tables);
                         return true;
                     }
@@ -227,7 +227,7 @@ function goTo2NFFinish (pd) {
                 } else {
                     PMA_ajaxShowMessage(data.extra, false);
                 }
-                $('#pma_navigation_reload').click();
+                $('#pma_navigation_reload').trigger('click');
             } else {
                 PMA_ajaxShowMessage(data.error, false);
             }
@@ -266,7 +266,7 @@ function goTo3NFFinish (newTables) {
                 } else {
                     PMA_ajaxShowMessage(data.extra, false);
                 }
-                $('#pma_navigation_reload').click();
+                $('#pma_navigation_reload').trigger('click');
             } else {
                 PMA_ajaxShowMessage(data.error, false);
             }
@@ -314,7 +314,7 @@ function goTo2NFStep2 (pd, primary_key) {
     }
     $('#mainContent #extra').html(extra);
     $('.tblFooters').html('<input type="button" value="' + PMA_messages.strBack + '" id="backEditPd"/><input type="button" id="goTo2NFFinish" value="' + PMA_messages.strGo + '"/>');
-    $('#goTo2NFFinish').click(function () {
+    $('#goTo2NFFinish').on('click', function () {
         goTo2NFFinish(pd);
     });
 }
@@ -363,7 +363,7 @@ function goTo3NFStep2 (pd, tablesTds) {
     }
     $('#mainContent #extra').html(extra);
     $('.tblFooters').html('<input type="button" value="' + PMA_messages.strBack + '" id="backEditPd"/><input type="button" id="goTo3NFFinish" value="' + PMA_messages.strGo + '"/>');
-    $('#goTo3NFFinish').click(function () {
+    $('#goTo3NFFinish').on('click', function () {
         if (!pdFound) {
             goTo3NFFinish([]);
         } else {
@@ -451,7 +451,7 @@ function moveRepeatingGroup (repeatingCols) {
                     goToStep3();
                 }
                 PMA_ajaxShowMessage(data.message, false);
-                $('#pma_navigation_reload').click();
+                $('#pma_navigation_reload').trigger('click');
             } else {
                 PMA_ajaxShowMessage(data.error, false);
             }
@@ -482,7 +482,7 @@ AJAX.registerOnload('normalization.js', function () {
         }
     });
 
-    $('#splitGo').click(function () {
+    $('#splitGo').on('click', function () {
         if (!selectedCol || selectedCol === '') {
             return false;
         }
diff --git a/js/replication.js b/js/replication.js
index 59f0f7e76f..51b360650b 100644
--- a/js/replication.js
+++ b/js/replication.js
@@ -49,33 +49,33 @@ AJAX.registerOnload('replication.js', function () {
     $('#db_type').on('change', update_config);
     $('#db_select').on('change', update_config);
 
-    $('#master_status_href').click(function () {
+    $('#master_status_href').on('click', function () {
         $('#replication_master_section').toggle();
     });
-    $('#master_slaves_href').click(function () {
+    $('#master_slaves_href').on('click', function () {
         $('#replication_slaves_section').toggle();
     });
-    $('#slave_status_href').click(function () {
+    $('#slave_status_href').on('click', function () {
         $('#replication_slave_section').toggle();
     });
-    $('#slave_control_href').click(function () {
+    $('#slave_control_href').on('click', function () {
         $('#slave_control_gui').toggle();
     });
-    $('#slave_errormanagement_href').click(function () {
+    $('#slave_errormanagement_href').on('click', function () {
         $('#slave_errormanagement_gui').toggle();
     });
-    $('#slave_synchronization_href').click(function () {
+    $('#slave_synchronization_href').on('click', function () {
         $('#slave_synchronization_gui').toggle();
     });
-    $('#db_reset_href').click(function () {
+    $('#db_reset_href').on('click', function () {
         $('#db_select option:selected').prop('selected', false);
         $('#db_select').trigger('change');
     });
-    $('#db_select_href').click(function () {
+    $('#db_select_href').on('click', function () {
         $('#db_select option').prop('selected', true);
         $('#db_select').trigger('change');
     });
-    $('#reset_slave').click(function (e) {
+    $('#reset_slave').on('click', function (e) {
         e.preventDefault();
         var $anchor = $(this);
         var question = PMA_messages.strResetSlaveWarning;
diff --git a/js/server_databases.js b/js/server_databases.js
index cb91d6b180..2285619b74 100644
--- a/js/server_databases.js
+++ b/js/server_databases.js
@@ -142,7 +142,7 @@ AJAX.registerOnload('server_databases.js', function () {
 
     var tableRows = $('.server_databases');
     $.each(tableRows, function (index, item) {
-        $(this).click(function () {
+        $(this).on('click', function () {
             PMA_commonActions.setDb($(this).attr('data'));
         });
     });
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 1625333657..eef6f26405 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -439,7 +439,7 @@ AJAX.registerOnload('server_privileges.js', function () {
         });
 
         // click handlers for submenu
-        $topmenu2.find('a').click(function (e) {
+        $topmenu2.find('a').on('click', function (e) {
             e.preventDefault();
             // if already active, ignore click
             if ($(this).hasClass('tabactive')) {
diff --git a/js/server_status_advisor.js b/js/server_status_advisor.js
index 089d7fd2f0..d5f65c8f4b 100644
--- a/js/server_status_advisor.js
+++ b/js/server_status_advisor.js
@@ -27,7 +27,7 @@ AJAX.registerOnload('server_status_advisor.js', function () {
         .attr('id', 'instructionsDialog')
         .html($('#advisorInstructionsDialog').html());
 
-    $('a[href="#openAdvisorInstructions"]').click(function () {
+    $('a[href="#openAdvisorInstructions"]').on('click', function () {
         var dlgBtns = {};
         dlgBtns[PMA_messages.strClose] = function () {
             $(this).dialog('close');
@@ -77,7 +77,7 @@ AJAX.registerOnload('server_status_advisor.js', function () {
             even = !even;
             $tr.data('rule', value);
 
-            $tr.click(function () {
+            $tr.on('click', function () {
                 var rule = $(this).data('rule');
                 $dialog
                     .dialog({ title: PMA_messages.strRuleDetails })
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index fa06dff28e..7f70af7632 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -32,7 +32,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     $('#addChartDialog')
         .appendTo('#page_content');
 
-    $('a.popupLink').click(function () {
+    $('a.popupLink').on('click', function () {
         var $link = $(this);
         $('div.' + $link.attr('href').substr(1))
             .show()
@@ -41,7 +41,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
         return false;
     });
-    $('body').click(function (event) {
+    $('body').on('click', function (event) {
         $('div.openedPopup').each(function () {
             var $cnt = $(this);
             var pos = $cnt.offset();
@@ -371,7 +371,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         defaultChartGrid.c5 = presetCharts.swap;
     }
 
-    $('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').click(function (event) {
+    $('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').on('click', function (event) {
         event.preventDefault();
         editMode = !editMode;
         if ($(this).attr('href') === '#endChartEditMode') {
@@ -482,7 +482,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         saveMonitor(); // Save settings
     });
 
-    $('a[href="#addNewChart"]').click(function (event) {
+    $('a[href="#addNewChart"]').on('click', function (event) {
         event.preventDefault();
         var dlgButtons = { };
 
@@ -530,12 +530,12 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 );
                 $('#chartPreset').prop('checked', true);
             });
-            $('#chartPreset').click(function () {
+            $('#chartPreset').on('click', function () {
                 $('input[name="chartTitle"]').val(
                     $presetList.find(':selected').text()
                 );
             });
-            $('#chartStatusVar').click(function () {
+            $('#chartStatusVar').on('click', function () {
                 $('input[name="chartTitle"]').val(
                     $('#chartSeries').find(':selected').text().replace(/_/g, ' ')
                 );
@@ -558,7 +558,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         return false;
     });
 
-    $('a[href="#exportMonitorConfig"]').click(function (event) {
+    $('a[href="#exportMonitorConfig"]').on('click', function (event) {
         event.preventDefault();
         var gridCopy = {};
         $.each(runtime.charts, function (key, elem) {
@@ -578,7 +578,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         window.URL.revokeObjectURL(url);
     });
 
-    $('a[href="#importMonitorConfig"]').click(function (event) {
+    $('a[href="#importMonitorConfig"]').on('click', function (event) {
         event.preventDefault();
         $('#emptyDialog').dialog({ title: PMA_messages.strImportDialogTitle });
         $('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form>' +
@@ -644,7 +644,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         });
     });
 
-    $('a[href="#clearMonitorConfig"]').click(function (event) {
+    $('a[href="#clearMonitorConfig"]').on('click', function (event) {
         event.preventDefault();
         if (isStorageSupported('localStorage')) {
             window.localStorage.removeItem('monitorCharts');
@@ -655,7 +655,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         rebuildGrid();
     });
 
-    $('a[href="#pauseCharts"]').click(function (event) {
+    $('a[href="#pauseCharts"]').on('click', function (event) {
         event.preventDefault();
         runtime.redrawCharts = ! runtime.redrawCharts;
         if (! runtime.redrawCharts) {
@@ -670,7 +670,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         return false;
     });
 
-    $('a[href="#monitorInstructionsDialog"]').click(function (event) {
+    $('a[href="#monitorInstructionsDialog"]').on('click', function (event) {
         event.preventDefault();
 
         var $dialog = $('#monitorInstructionsDialog');
@@ -794,7 +794,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
                     $dialog.find('div.ajaxContent').html(str);
                     $dialog.find('img.ajaxIcon').hide();
-                    $dialog.find('a.set').click(function () {
+                    $dialog.find('a.set').on('click', function () {
                         var nameValue = $(this).attr('href').split('-');
                         loadLogVars({ varName: nameValue[0].substr(1), varValue: nameValue[1] });
                         $dialog.find('img.ajaxIcon').show();
@@ -835,7 +835,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         }
     });
 
-    $('a[href="#kibDivisor"]').click(function (event) {
+    $('a[href="#kibDivisor"]').on('click', function (event) {
         event.preventDefault();
         $('input[name="valueDivisor"]').val(1024);
         $('input[name="valueUnit"]').val(PMA_messages.strKiB);
@@ -844,7 +844,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         return false;
     });
 
-    $('a[href="#mibDivisor"]').click(function (event) {
+    $('a[href="#mibDivisor"]').on('click', function (event) {
         event.preventDefault();
         $('input[name="valueDivisor"]').val(1024 * 1024);
         $('input[name="valueUnit"]').val(PMA_messages.strMiB);
@@ -853,14 +853,14 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         return false;
     });
 
-    $('a[href="#submitClearSeries"]').click(function (event) {
+    $('a[href="#submitClearSeries"]').on('click', function (event) {
         event.preventDefault();
         $('#seriesPreview').html('<i>' + PMA_messages.strNone + '</i>');
         newChart = null;
         $('#clearSeriesLink').hide();
     });
 
-    $('a[href="#submitAddSeries"]').click(function (event) {
+    $('a[href="#submitAddSeries"]').on('click', function (event) {
         event.preventDefault();
         if ($('#variableInput').val() === '') {
             return false;
@@ -1657,7 +1657,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     });
 
                     if (logData.numRows > 250) {
-                        $('#startFilterQueryText').click(filterQueries);
+                        $('#startFilterQueryText').on('click', filterQueries);
                     } else {
                         $('#filterQueryText').keyup(filterQueries);
                     }
@@ -1896,7 +1896,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 // Assuming the query column is the second last
                 if (j === cols.length - 2 && rows[i][cols[j]].match(/^SELECT/i)) {
                     $tRow.append($tCell = $('<td class="linkElem">' + formatValue(cols[j], rows[i][cols[j]]) + '</td>'));
-                    $tCell.click(openQueryAnalyzer);
+                    $tCell.on('click', openQueryAnalyzer);
                 } else {
                     $tRow.append('<td>' + formatValue(cols[j], rows[i][cols[j]]) + '</td>');
                 }
@@ -2051,7 +2051,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
             $('#queryAnalyzerDialog').find('div.placeHolder td.explain').append(explain);
 
-            $('#queryAnalyzerDialog').find('div.placeHolder a[href*="#showExplain"]').click(function () {
+            $('#queryAnalyzerDialog').find('div.placeHolder a[href*="#showExplain"]').on('click', function () {
                 var id = $(this).attr('href').split('-')[1];
                 $(this).parent().find('div[class*="explain"]').hide();
                 $(this).parent().find('div[class*="explain-' + id + '"]').show();
@@ -2094,13 +2094,13 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     '(<a href="#showNums">' + PMA_messages.strTable + '</a>, <a href="#showChart">' + PMA_messages.strChart + '</a>)<br/>' +
                     numberTable + ' <div id="queryProfiling"></div>');
 
-                $('#queryAnalyzerDialog').find('div.placeHolder a[href="#showNums"]').click(function () {
+                $('#queryAnalyzerDialog').find('div.placeHolder a[href="#showNums"]').on('click', function () {
                     $('#queryAnalyzerDialog').find('#queryProfiling').hide();
                     $('#queryAnalyzerDialog').find('table.queryNums').show();
                     return false;
                 });
 
-                $('#queryAnalyzerDialog').find('div.placeHolder a[href="#showChart"]').click(function () {
+                $('#queryAnalyzerDialog').find('div.placeHolder a[href="#showChart"]').on('click', function () {
                     $('#queryAnalyzerDialog').find('#queryProfiling').show();
                     $('#queryAnalyzerDialog').find('table.queryNums').hide();
                     return false;
diff --git a/js/server_variables.js b/js/server_variables.js
index af4812acf6..787419ee99 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -37,7 +37,7 @@ AJAX.registerOnload('server_variables.js', function () {
         $cell.addClass('edit'); // variable is being edited
         $myEditLink.remove(); // remove edit link
 
-        $mySaveLink.click(function () {
+        $mySaveLink.on('click', function () {
             var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.post($(this).attr('href'), {
                 ajax_request: true,
@@ -63,7 +63,7 @@ AJAX.registerOnload('server_variables.js', function () {
             return false;
         });
 
-        $myCancelLink.click(function () {
+        $myCancelLink.on('click', function () {
             $valueCell.html($valueCell.data('content'));
             $cell.removeClass('edit').html($myEditLink);
             return false;
diff --git a/js/sql.js b/js/sql.js
index 28154b060c..e4d07af87e 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -516,7 +516,7 @@ AJAX.registerOnload('sql.js', function () {
             // because when you are in the Bookmarked SQL query
             // section and hit enter, you expect it to do the
             // same action as the Go button in that section.
-            $('#button_submit_bookmark').click();
+            $('#button_submit_bookmark').trigger('click');
             return false;
         } else  {
             return true;
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index c13db82aa6..c2e67f5102 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -264,7 +264,7 @@ AJAX.registerOnload('tbl_chart.js', function () {
     });
 
     // handle chart type changes
-    $('input[name="chartType"]').click(function () {
+    $('input[name="chartType"]').on('click', function () {
         var type = currentSettings.type = $(this).val();
         if (type === 'bar' || type === 'column' || type === 'area') {
             $('span.barStacked').show();
@@ -277,7 +277,7 @@ AJAX.registerOnload('tbl_chart.js', function () {
     });
 
     // handle chosing alternative data format
-    $('input[name="chkAlternative"]').click(function () {
+    $('input[name="chkAlternative"]').on('click', function () {
         var $seriesColumn = $('select[name="chartSeriesColumn"]');
         var $valueColumn  = $('select[name="chartValueColumn"]');
         var $chartSeries  = $('select[name="chartSeries"]');
@@ -298,7 +298,7 @@ AJAX.registerOnload('tbl_chart.js', function () {
     });
 
     // handle stacking for bar, column and area charts
-    $('input[name="barStacked"]').click(function () {
+    $('input[name="barStacked"]').on('click', function () {
         if ($(this).is(':checked')) {
             $.extend(true, currentSettings, { stackSeries : true });
         } else {
diff --git a/js/tbl_find_replace.js b/js/tbl_find_replace.js
index 8b48e53ef7..09d4042072 100644
--- a/js/tbl_find_replace.js
+++ b/js/tbl_find_replace.js
@@ -16,7 +16,7 @@ AJAX.registerOnload('tbl_find_replace.js', function () {
 
     $('#toggle_find')
         .html(PMA_messages.strHideFindNReplaceCriteria)
-        .click(function () {
+        .on('click', function () {
             var $link = $(this);
             $('#find_replace_form').slideToggle();
             if ($link.text() === PMA_messages.strHideFindNReplaceCriteria) {
@@ -36,7 +36,7 @@ AJAX.registerOnload('tbl_find_replace.js', function () {
             PMA_ajaxRemoveMessage($msgbox);
             if (data.success === true) {
                 $('#toggle_find_div').show();
-                $('#toggle_find').click();
+                $('#toggle_find').trigger('click');
                 $('#sqlqueryresultsouter').html(data.preview);
             } else {
                 $('#sqlqueryresultsouter').html(data.error);
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 92808d94b9..c1affbc186 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -490,16 +490,16 @@ AJAX.registerOnload('tbl_structure.js', function () {
     var tableRows = $('.central_columns');
     $.each(tableRows, function (index, item) {
         if ($(item).hasClass('add_button')) {
-            $(item).click(function () {
+            $(item).on('click', function () {
                 $('input:checkbox').prop('checked', false);
                 $('#checkbox_row_' + (index + 1)).prop('checked', true);
-                $('button[value=add_to_central_columns]').click();
+                $('button[value=add_to_central_columns]').trigger('click');
             });
         } else {
-            $(item).click(function () {
+            $(item).on('click', function () {
                 $('input:checkbox').prop('checked', false);
                 $('#checkbox_row_' + (index + 1)).prop('checked', true);
-                $('button[value=remove_from_central_columns]').click();
+                $('button[value=remove_from_central_columns]').trigger('click');
             });
         }
     });
diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index 6cf7438c15..27435cb36e 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -239,7 +239,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
     /**
      * Input form validation
      **/
-    $('#inputFormSubmitId').click(function () {
+    $('#inputFormSubmitId').on('click', function () {
         if ($('#tableid_0').get(0).selectedIndex === 0 || $('#tableid_1').get(0).selectedIndex === 0) {
             PMA_ajaxShowMessage(PMA_messages.strInputNull);
         } else if (xLabel === yLabel) {
@@ -568,7 +568,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
         currentChart = $.jqplot('querychart', series, options);
         currentChart.resetZoom();
 
-        $('button.button-reset').click(function (event) {
+        $('button.button-reset').on('click', function (event) {
             event.preventDefault();
             currentChart.resetZoom();
         });
@@ -622,7 +622,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
         );
     }
 
-    $('#help_dialog').click(function () {
+    $('#help_dialog').on('click', function () {
         displayHelp();
     });
 });