gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13174 from phpmyadmin/fix_13166

Browse Source 
Replaced deprecated jQuery calls.
This commit is contained in:
Michal Čihař 2017-04-10 12:51:36 +02:00 committed by GitHub
commit db87fa8356
31 changed files with 221 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ajax.js
View File

@ -66,7 +66,7 @@ var AJAX = {
*/
registerOnload: function (file, func) {
var eventName = 'onload_' + AJAX.hash(file);
$(document).bind(eventName, func);
$(document).on(eventName, func);
if (this._debug) {
console.log(
// no need to translate
@ -87,7 +87,7 @@ var AJAX = {
*/
registerTeardown: function (file, func) {
var eventName = 'teardown_' + AJAX.hash(file);
$(document).bind(eventName, func);
$(document).on(eventName, func);
if (this._debug) {
console.log(
// no need to translate
@ -446,11 +446,11 @@ var AJAX = {
.insertAfter('#selflink')
.append(data._errors);
// bind for php error reporting forms (bottom)
$("#pma_ignore_errors_bottom").bind("click", function(e) {
$("#pma_ignore_errors_bottom").on("click", function(e) {
e.preventDefault();
PMA_ignorePhpErrors();
});
$("#pma_ignore_all_errors_bottom").bind("click", function(e) {
$("#pma_ignore_all_errors_bottom").on("click", function(e) {
e.preventDefault();
PMA_ignorePhpErrors(false);
});
@ -471,10 +471,10 @@ var AJAX = {
}
PMA_ajaxShowMessage(msg, false);
// bind for php error reporting forms (popup)
$("#pma_ignore_errors_popup").bind("click", function() {
$("#pma_ignore_errors_popup").on("click", function() {
PMA_ignorePhpErrors();
});
$("#pma_ignore_all_errors_popup").bind("click", function() {
$("#pma_ignore_all_errors_popup").on("click", function() {
PMA_ignorePhpErrors(false);
});

20
js/config.js
View File

@ -33,13 +33,13 @@ function isStorageSupported(type, warn)
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('config.js', function () {
$('.optbox input[id], .optbox select[id], .optbox textarea[id]').unbind('change').unbind('keyup');
$('.optbox input[type=button][name=submit_reset]').unbind('click');
$('div.tabs_contents').undelegate();
$('#import_local_storage, #export_local_storage').unbind('click');
$('form.prefs-form').unbind('change').unbind('submit');
$('.optbox input[id], .optbox select[id], .optbox textarea[id]').off('change').off('keyup');
$('.optbox input[type=button][name=submit_reset]').off('click');
$('div.tabs_contents').off();
$('#import_local_storage, #export_local_storage').off('click');
$('form.prefs-form').off('change').off('submit');
$(document).off('click', 'div.click-hide-message');
$('#prefs_autoload').find('a').unbind('click');
$('#prefs_autoload').find('a').off('click');
});
AJAX.registerOnload('config.js', function () {
@ -526,7 +526,7 @@ function setupValidation() {
$elements.each(function () {
markField(this);
var $el = $(this);
$el.bind('change', function () {
$el.on('change', function () {
validate_field_and_fieldset(this, false);
markField(this);
});
@ -681,13 +681,13 @@ function restoreField(field_id)
function setupRestoreField() {
$('div.tabs_contents')
.delegate('.restore-default, .set-value', 'mouseenter', function () {
.on('mouseenter', '.restore-default, .set-value', function () {
$(this).css('opacity', 1);
})
.delegate('.restore-default, .set-value', 'mouseleave', function () {
.on('mouseleave', '.restore-default, .set-value', function () {
$(this).css('opacity', 0.25);
})
.delegate('.restore-default, .set-value', 'click', function (e) {
.on('click', '.restore-default, .set-value', function (e) {
e.preventDefault();
var href = $(this).attr('href');
var field_sel;

12
js/console.js
View File

@ -90,7 +90,7 @@ var PMA_console = {
'">' +
'</form>'
);
PMA_console.$requestForm.bind('submit', AJAX.requestHandler);
PMA_console.$requestForm.on('submit', AJAX.requestHandler);
// Event binds shouldn't run again
if (PMA_console.isInitialized === false) {
@ -453,7 +453,7 @@ var PMA_consoleResizer = {
$(document).mousemove(PMA_consoleResizer._mousemove);
$(document).mouseup(PMA_consoleResizer._mouseup);
// Disable text selection while resizing
$(document).bind('selectstart', function() { return false; });
$(document).on('selectstart', function() { return false; });
},
/**
* Mousemove event handler for bind to resizer
@ -489,9 +489,9 @@ var PMA_consoleResizer = {
_mouseup: function() {
$.cookie('pma_console_height', PMA_consoleResizer._resultHeight);
PMA_console.show();
$(document).unbind('mousemove');
$(document).unbind('mouseup');
$(document).unbind('selectstart');
$(document).off('mousemove');
$(document).off('mouseup');
$(document).off('selectstart');
},
/**
* Used for console resizer initialize
@ -499,7 +499,7 @@ var PMA_consoleResizer = {
* @return void
*/
initialize: function() {
$('#pma_console').find('.toolbar').unbind('mousedown');
$('#pma_console').find('.toolbar').off('mousedown');
$('#pma_console').find('.toolbar').mousedown(PMA_consoleResizer._mousedown);
}
};

26
js/db_central_columns.js
View File

@ -17,20 +17,20 @@
*/
AJAX.registerTeardown('db_central_columns.js', function () {
$(".edit").unbind('click');
$(".edit_save_form").unbind('click');
$('.edit_cancel_form').unbind('click');
$(".del_row").unbind('click');
$(".edit").off('click');
$(".edit_save_form").off('click');
$('.edit_cancel_form').off('click');
$(".del_row").off('click');
$(document).off("keyup", ".filter_rows");
$('.edit_cancel_form').unbind('click');
$('#table-select').unbind('change');
$('#column-select').unbind('change');
$("#add_col_div").find(">a").unbind('click');
$('#add_new').unbind('submit');
$('#multi_edit_central_columns').unbind('submit');
$("select.default_type").unbind('change');
$("button[name='delete_central_columns']").unbind('click');
$("button[name='edit_central_columns']").unbind('click');
$('.edit_cancel_form').off('click');
$('#table-select').off('change');
$('#column-select').off('change');
$("#add_col_div").find(">a").off('click');
$('#add_new').off('submit');
$('#multi_edit_central_columns').off('submit');
$("select.default_type").off('change');
$("button[name='delete_central_columns']").off('click');
$("button[name='edit_central_columns']").off('click');
});
AJAX.registerOnload('db_central_columns.js', function () {

18
js/db_search.js
View File

@ -19,12 +19,12 @@
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('db_search.js', function () {
$('a.browse_results').unbind('click');
$('a.delete_results').unbind('click');
$('#buttonGo').unbind('click');
$('#togglesearchresultlink').unbind('click');
$("#togglequerybox").unbind('click');
$('#togglesearchformlink').unbind('click');
$('a.browse_results').off('click');
$('a.delete_results').off('click');
$('#buttonGo').off('click');
$('#togglesearchresultlink').off('click');
$("#togglequerybox").off('click');
$('#togglesearchformlink').off('click');
$(document).off('submit', "#db_search_form.ajax");
});
@ -53,7 +53,7 @@ AJAX.registerOnload('db_search.js', function () {
*/
$('#togglesearchresultlink')
.html(PMA_messages.strHideSearchResults)
.bind('click', function () {
.on('click', function () {
var $link = $(this);
$('#searchresults').slideToggle();
if ($link.text() == PMA_messages.strHideSearchResults) {
@ -78,7 +78,7 @@ AJAX.registerOnload('db_search.js', function () {
*/
$("#togglequerybox")
.hide()
.bind('click', function () {
.on('click', function () {
var $link = $(this);
$('#sqlqueryform').slideToggle("medium");
if ($link.text() == PMA_messages.strHideQueryBox) {
@ -98,7 +98,7 @@ AJAX.registerOnload('db_search.js', function () {
*/
$('#togglesearchformlink')
.html(PMA_messages.strShowSearchCriteria)
.bind('click', function () {
.on('click', function () {
var $link = $(this);
$('#db_search_form').slideToggle();
if ($link.text() == PMA_messages.strHideSearchCriteria) {

4
js/db_structure.js
View File

@ -29,8 +29,8 @@ AJAX.registerTeardown('db_structure.js', function () {
$(document).off('click', '#printView');
$('a.real_row_count').off('click');
$('a.row_count_sum').off('click');
$('select[name=submit_mult]').unbind('change');
$("#filterText").unbind('keyup');
$('select[name=submit_mult]').off('change');
$("#filterText").off('keyup');
});
/**

12
js/export.js
View File

@ -217,13 +217,13 @@ function deleteTemplate(id)
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('export.js', function () {
$("#plugins").unbind('change');
$("input[type='radio'][name='sql_structure_or_data']").unbind('change');
$("#plugins").off('change');
$("input[type='radio'][name='sql_structure_or_data']").off('change');
$("input[type='radio'][name$='_structure_or_data']").off('change');
$("input[type='radio'][name='output_format']").unbind('change');
$("#checkbox_sql_include_comments").unbind('change');
$("input[type='radio'][name='quick_or_custom']").unbind('change');
$("input[type='radio'][name='allrows']").unbind('change');
$("input[type='radio'][name='output_format']").off('change');
$("#checkbox_sql_include_comments").off('change');
$("input[type='radio'][name='quick_or_custom']").off('change');
$("input[type='radio'][name='allrows']").off('change');
$('#btn_alias_config').off('click');
$('#db_alias_select').off('change');
$('.table_alias_select').off('change');

31
js/functions.js
View File

@ -1851,25 +1851,25 @@ AJAX.registerTeardown('functions.js', function () {
$(document).off('click', "a.inline_edit_sql");
$(document).off('click', "input#sql_query_edit_save");
$(document).off('click', "input#sql_query_edit_discard");
$('input.sqlbutton').unbind('click');
$('input.sqlbutton').off('click');
if (codemirror_editor) {
codemirror_editor.off('blur');
} else {
$(document).off('blur', '#sqlquery');
}
$(document).off('change', '#parameterized');
$('#sqlquery').unbind('keydown');
$('#sql_query_edit').unbind('keydown');
$('#sqlquery').off('keydown');
$('#sql_query_edit').off('keydown');
if (codemirror_inline_editor) {
// Copy the sql query to the text area to preserve it.
$('#sql_query_edit').text(codemirror_inline_editor.getValue());
$(codemirror_inline_editor.getWrapperElement()).unbind('keydown');
$(codemirror_inline_editor.getWrapperElement()).off('keydown');
codemirror_inline_editor.toTextArea();
codemirror_inline_editor = false;
}
if (codemirror_editor) {
$(codemirror_editor.getWrapperElement()).unbind('keydown');
$(codemirror_editor.getWrapperElement()).off('keydown');
}
});
@ -2075,11 +2075,11 @@ function bindCodeMirrorToInlineEditor() {
codemirror_inline_editor.refresh();
codemirror_inline_editor.focus();
$(codemirror_inline_editor.getWrapperElement())
.bind('keydown', catchKeypressesFromSqlInlineEdit);
.on('keydown', catchKeypressesFromSqlInlineEdit);
} else {
$inline_editor
.focus()
.bind('keydown', catchKeypressesFromSqlInlineEdit);
.on('keydown', catchKeypressesFromSqlInlineEdit);
}
}
}
@ -3237,7 +3237,7 @@ AJAX.registerOnload('functions.js', function () {
.find("input#text_pma_pw").focus();
$('#fieldset_change_password_footer').hide();
PMA_ajaxRemoveMessage($msgbox);
$('#change_password_form').bind('submit', function (e) {
$('#change_password_form').on('submit', function (e) {
e.preventDefault();
$(this)
.closest('.ui-dialog')
@ -4117,7 +4117,7 @@ var toggleButton = function ($obj) {
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('functions.js', function () {
$('div.container').unbind('click');
$('div.container').off('click');
});
/**
* Initialise all toggle buttons
@ -4143,8 +4143,8 @@ AJAX.registerOnload('functions.js', function () {
AJAX.registerTeardown('functions.js', function () {
$(document).off('change', 'select.pageselector');
$(document).off('click', 'a.formLinkSubmit');
$('#update_recent_tables').unbind('ready');
$('#sync_favorite_tables').unbind('ready');
$('#update_recent_tables').off('ready');
$('#sync_favorite_tables').off('ready');
});
AJAX.registerOnload('functions.js', function () {
@ -4407,8 +4407,7 @@ AJAX.registerOnload('functions.js', function () {
codemirror_editor.on("blur", updateQueryParameters);
} else {
// without codemirror
$elm.focus()
.bind('blur', updateQueryParameters);
$elm.focus().on('blur', updateQueryParameters);
}
}
PMA_highlightSQL($('body'));
@ -4483,7 +4482,7 @@ $(window).on('popstate', function (event, data) {
AJAX.registerTeardown('functions.js', function () {
$(document).off('click', 'a.themeselect');
$(document).off('change', '.autosubmit');
$('a.take_theme').unbind('click');
$('a.take_theme').off('click');
});
AJAX.registerOnload('functions.js', function () {
@ -4667,7 +4666,7 @@ function copyToClipboard()
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('functions.js', function () {
$('input#print').unbind('click');
$('input#print').off('click');
$(document).off('click', 'a.create_view.ajax');
$(document).off('keydown', '#createViewDialog input, #createViewDialog select');
$(document).off('change', '#fkc_checkbox');
@ -4792,7 +4791,7 @@ $(function () {
* Scrolls the page to the top if clicking the serverinfo bar
*/
$(function () {
$(document).delegate("#serverinfo, #goto_pagetop", "click", function (event) {
$(document).on("click", "#serverinfo, #goto_pagetop", function (event) {
event.preventDefault();
$('html, body').animate({scrollTop: 0}, 'fast');
});

16
js/import.js
View File

@ -48,12 +48,12 @@ function matchFile(fname)
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('import.js', function () {
$("#plugins").unbind('change');
$("#input_import_file").unbind('change');
$("#select_local_import_file").unbind('change');
$("#input_import_file").unbind('change').unbind('focus');
$("#select_local_import_file").unbind('focus');
$("#text_csv_enclosed").add("#text_csv_escaped").unbind('keyup');
$("#plugins").off('change');
$("#input_import_file").off('change');
$("#select_local_import_file").off('change');
$("#input_import_file").off('change').off('focus');
$("#select_local_import_file").off('focus');
$("#text_csv_enclosed").add("#text_csv_escaped").off('keyup');
});
AJAX.registerOnload('import.js', function () {
@ -118,7 +118,7 @@ AJAX.registerOnload('import.js', function () {
* When the "Browse the server" form is clicked or the "Select from the web server upload directory"
* form is clicked, the radio button beside it becomes selected and the other form becomes disabled.
*/
$("#input_import_file").bind("focus change", function () {
$("#input_import_file").on("focus change", function () {
$("#radio_import_file").prop('checked', true);
$("#radio_local_import_file").prop('checked', false);
});
@ -147,7 +147,7 @@ AJAX.registerOnload('import.js', function () {
* as mysql allows just one character for these fields,
* if first character is escape then allow two including escape character.
*/
$("#text_csv_enclosed").add("#text_csv_escaped").bind('keyup', function() {
$("#text_csv_enclosed").add("#text_csv_escaped").on('keyup', function() {
if($(this).val().length === 2 && $(this).val().charAt(0) !== "\\") {
$(this).val($(this).val().substring(0, 1));
return false;

22
js/makegrid.js
View File

@ -1069,7 +1069,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// unbind the mousedown event to prevent the problem of
// datepicker getting closed, needs to be checked for any
// change in names when updating
$(document).unbind('mousedown', $.datepicker._checkExternalClick);
$(document).off('mousedown', $.datepicker._checkExternalClick);
//move ui-datepicker-div inside cEdit div
var datepicker_div = $('#ui-datepicker-div');
@ -1330,8 +1330,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// update delete confirmation in Delete link
if ($(this).attr('href').indexOf('DELETE') > -1) {
$(this).removeAttr('onclick')
.unbind('click')
.bind('click', function () {
.off('click')
.on('click', function () {
return confirmLink(this, 'DELETE FROM `' + g.db + '`.`' + g.table + '` WHERE ' +
decoded_new_clause + (is_unique ? '' : ' LIMIT 1'));
});
@ -1639,7 +1639,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$(g.gDiv).append(g.cCpy);
// prevent default "dragstart" event when dragging a link
$(g.t).find('th a').bind('dragstart', function () {
$(g.t).find('th a').on('dragstart', function () {
return false;
});
@ -2094,7 +2094,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.hideEditCell();
g.postEditedCell();
});
$(window).bind('beforeunload', function () {
$(window).on('beforeunload', function () {
if (g.isCellEdited) {
return g.saveCellWarning;
}
@ -2255,16 +2255,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (prevent) {
return this.each(function () {
if (is_msie || is_safari) {
$(this).bind('selectstart', function () {
return false;
});
$(this).on('selectstart', false);
} else if (is_firefox) {
$(this).css('MozUserSelect', 'none');
$('body').trigger('focus');
} else if (is_opera) {
$(this).bind('mousedown', function () {
return false;
});
$(this).on('mousedown', false);
} else {
$(this).attr('unselectable', 'on');
}
@ -2272,11 +2268,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
} else {
return this.each(function () {
if (is_msie || is_safari) {
$(this).unbind('selectstart');
$(this).off('selectstart');
} else if (is_firefox) {
$(this).css('MozUserSelect', 'inherit');
} else if (is_opera) {
$(this).unbind('mousedown');
$(this).off('mousedown');
} else {
$(this).removeAttr('unselectable');
}

2
js/menu-resizer.js
View File

@ -27,7 +27,7 @@
// create submenu container
var link = $('<a />', {href: '#', 'class': 'tab nowrap'})
.text(PMA_messages.strMore)
.bind('click', false); // same as event.preventDefault()
.on('click', false); // same as event.preventDefault()
var img = $container.find('li img');
if (img.length) {
$(PMA_getImage('b_more.png').toString()).prependTo(link);

8
js/navigation.js
View File

@ -1201,9 +1201,9 @@ var ResizeHandler = function () {
this.mousedown = function (event) {
event.preventDefault();
$(document)
.bind('mousemove', {'resize_handler': event.data.resize_handler},
.on('mousemove', {'resize_handler': event.data.resize_handler},
$.throttle(event.data.resize_handler.mousemove, 4))
.bind('mouseup', {'resize_handler': event.data.resize_handler},
.on('mouseup', {'resize_handler': event.data.resize_handler},
event.data.resize_handler.mouseup);
$('body').css('cursor', 'col-resize');
};
@ -1219,8 +1219,8 @@ var ResizeHandler = function () {
$.cookie('pma_navi_width', event.data.resize_handler.getPos(event));
$('#topmenu').menuResizer('resize');
$(document)
.unbind('mousemove')
.unbind('mouseup');
.off('mousemove')
.off('mouseup');
};
/**
* Event handler for updating the panel during a resize operation

2
js/normalization.js
View File

@ -466,7 +466,7 @@ function moveRepeatingGroup(repeatingCols) {
}
AJAX.registerTeardown('normalization.js', function () {
$("#extra").off("click", "#selectNonAtomicCol");
$("#splitGo").unbind('click');
$("#splitGo").off('click');
$('.tblFooters').off("click", "#saveSplit");
$("#extra").off("click", "#addNewPrimary");
$(".tblFooters").off("click", "#saveNewPrimary");

8
js/page_settings.js
View File

@ -46,14 +46,14 @@ function showNaviSettings() {
AJAX.registerTeardown('page_settings.js', function () {
$('#page_settings_icon').css('display', 'none');
$('#page_settings_icon').unbind('click');
$('#pma_navigation_settings_icon').unbind('click');
$('#page_settings_icon').off('click');
$('#pma_navigation_settings_icon').off('click');
});
AJAX.registerOnload('page_settings.js', function () {
if ($('#page_settings_modal').length) {
$('#page_settings_icon').css('display', 'inline');
$('#page_settings_icon').bind('click', showPageSettings);
$('#page_settings_icon').on('click', showPageSettings);
}
$('#pma_navigation_settings_icon').bind('click', showNaviSettings);
$('#pma_navigation_settings_icon').on('click', showNaviSettings);
});

8
js/pmd/history.js
View File

@ -846,10 +846,10 @@ AJAX.registerTeardown('pmd/history.js', function () {
vqb_editor = null;
history_array = [];
select_field = [];
$("#ok_edit_rename").unbind('click');
$("#ok_edit_having").unbind('click');
$("#ok_edit_Aggr").unbind('click');
$("#ok_edit_where").unbind('click');
$("#ok_edit_rename").off('click');
$("#ok_edit_having").off('click');
$("#ok_edit_Aggr").off('click');
$("#ok_edit_where").off('click');
});
AJAX.registerOnload('pmd/history.js', function () {

2
js/pmd/init.js
View File

@ -6,7 +6,7 @@
var j_tabs, h_tabs, contr, display_field, server, db, selected_page, pmd_tables_enabled;
AJAX.registerTeardown('pmd/init.js', function () {
$(".trigger").unbind('click');
$(".trigger").off('click');
});
AJAX.registerOnload('pmd/init.js', function () {

72
js/pmd/move.js
View File

@ -1897,49 +1897,49 @@ function add_object()
AJAX.registerTeardown('pmd/move.js', function () {
$('#side_menu').off('mouseenter mouseleave');
$("#key_Show_left_menu").unbind('click');
$("#toggleFullscreen").unbind('click');
$("#newPage").unbind('click');
$("#editPage").unbind('click');
$("#savePos").unbind('click');
$("#SaveAs").unbind('click');
$("#delPages").unbind('click');
$("#StartTableNew").unbind('click');
$("#rel_button").unbind('click');
$("#StartTableNew").unbind('click');
$("#display_field_button").unbind('click');
$("#reloadPage").unbind('click');
$("#angular_direct_button").unbind('click');
$("#grid_button").unbind('click');
$("#key_SB_all").unbind('click');
$("#SmallTabInvert").unbind('click');
$("#relLineInvert").unbind('click');
$("#exportPages").unbind('click');
$("#query_builder").unbind('click');
$("#key_Left_Right").unbind('click');
$("#pin_Text").unbind('click');
$("#canvas").unbind('click');
$("#key_HS_all").unbind('click');
$("#key_HS").unbind('click');
$('.scroll_tab_struct').unbind('click');
$('.scroll_tab_checkbox').unbind('click');
$("#key_Show_left_menu").off('click');
$("#toggleFullscreen").off('click');
$("#newPage").off('click');
$("#editPage").off('click');
$("#savePos").off('click');
$("#SaveAs").off('click');
$("#delPages").off('click');
$("#StartTableNew").off('click');
$("#rel_button").off('click');
$("#StartTableNew").off('click');
$("#display_field_button").off('click');
$("#reloadPage").off('click');
$("#angular_direct_button").off('click');
$("#grid_button").off('click');
$("#key_SB_all").off('click');
$("#SmallTabInvert").off('click');
$("#relLineInvert").off('click');
$("#exportPages").off('click');
$("#query_builder").off('click');
$("#key_Left_Right").off('click');
$("#pin_Text").off('click');
$("#canvas").off('click');
$("#key_HS_all").off('click');
$("#key_HS").off('click');
$('.scroll_tab_struct').off('click');
$('.scroll_tab_checkbox').off('click');
$('#id_scroll_tab').find('tr').off('click', '.pmd_Tabs2,.pmd_Tabs');
$('.pmd_tab').off('click', '.select_all_1');
$('.pmd_tab').off('click', '.small_tab,.small_tab2');
$('.pmd_tab').off('click', '.small_tab_pref_1');
$('.tab_zag_noquery').unbind('mouseover');
$('.tab_zag_noquery').unbind('mouseout');
$('.tab_zag_query').unbind('mouseover');
$('.tab_zag_query').unbind('mouseout');
$('.tab_zag_noquery').off('mouseover');
$('.tab_zag_noquery').off('mouseout');
$('.tab_zag_query').off('mouseover');
$('.tab_zag_query').off('mouseout');
$('.pmd_tab').off('click','.tab_field_2,.tab_field_3,.tab_field');
$('.pmd_tab').off('click', '.select_all_store_col');
$('.pmd_tab').off('click', '.small_tab_pref_click_opt');
$("#del_button").unbind('click');
$("#cancel_button").unbind('click');
$("#ok_add_object").unbind('click');
$("#cancel_close_option").unbind('click');
$("#ok_new_rel_panel").unbind('click');
$("#cancel_new_rel_panel").unbind('click');
$("#del_button").off('click');
$("#cancel_button").off('click');
$("#ok_add_object").off('click');
$("#cancel_close_option").off('click');
$("#ok_new_rel_panel").off('click');
$("#cancel_new_rel_panel").off('click');
});
AJAX.registerOnload('pmd/move.js', function () {

22
js/replication.js
View File

@ -32,17 +32,17 @@ function update_config()
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('replication.js', function () {
$('#db_type').unbind('change');
$('#db_select').unbind('change');
$('#master_status_href').unbind('click');
$('#master_slaves_href').unbind('click');
$('#slave_status_href').unbind('click');
$('#slave_control_href').unbind('click');
$('#slave_errormanagement_href').unbind('click');
$('#slave_synchronization_href').unbind('click');
$('#db_reset_href').unbind('click');
$('#db_select_href').unbind('click');
$('#reset_slave').unbind('click');
$('#db_type').off('change');
$('#db_select').off('change');
$('#master_status_href').off('click');
$('#master_slaves_href').off('click');
$('#slave_status_href').off('click');
$('#slave_control_href').off('click');
$('#slave_errormanagement_href').off('click');
$('#slave_synchronization_href').off('click');
$('#db_reset_href').off('click');
$('#db_select_href').off('click');
$('#reset_slave').off('click');
});
AJAX.registerOnload('replication.js', function () {

2
js/server_databases.js
View File

@ -14,7 +14,7 @@
AJAX.registerTeardown('server_databases.js', function () {
$(document).off('submit', "#dbStatsForm");
$(document).off('submit', '#create_database_form.ajax');
$('#filterText').unbind('keyup');
$('#filterText').off('keyup');
});
/**

2
js/server_privileges.js
View File

@ -87,7 +87,7 @@ AJAX.registerTeardown('server_privileges.js', function () {
$(document).off('click', "button.mult_submit[value=export]");
$(document).off('click', "a.export_user_anchor.ajax");
$(document).off('click', "#initials_table a.ajax");
$('#checkbox_drop_users_db').unbind('click');
$('#checkbox_drop_users_db').off('click');
$(document).off("click", ".checkall_box");
$(document).off('change', '#checkbox_SSL_priv');
$(document).off('change', 'input[name="ssl_type"]');

2
js/server_status_advisor.js
View File

@ -9,7 +9,7 @@
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('server_status_advisor.js', function () {
$('a[href="#openAdvisorInstructions"]').unbind('click');
$('a[href="#openAdvisorInstructions"]').off('click');
$('#statustabs_advisor').html('');
$('#advisorDialog').remove();
$('#instructionsDialog').remove();

50
js/server_status_monitor.js
View File

@ -19,8 +19,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
AJAX.registerTeardown('server_status_monitor.js', function () {
$('#emptyDialog').remove();
$('#addChartDialog').remove();
$('a.popupLink').unbind('click');
$('body').unbind('click');
$('a.popupLink').off('click');
$('body').off('click');
});
/**
* Popup behaviour
@ -58,26 +58,26 @@ AJAX.registerOnload('server_status_monitor.js', function () {
});
AJAX.registerTeardown('server_status_monitor.js', function () {
$('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').unbind('click');
$('div.popupContent select[name="chartColumns"]').unbind('change');
$('div.popupContent select[name="gridChartRefresh"]').unbind('change');
$('a[href="#addNewChart"]').unbind('click');
$('a[href="#exportMonitorConfig"]').unbind('click');
$('a[href="#importMonitorConfig"]').unbind('click');
$('a[href="#clearMonitorConfig"]').unbind('click');
$('a[href="#pauseCharts"]').unbind('click');
$('a[href="#monitorInstructionsDialog"]').unbind('click');
$('input[name="chartType"]').unbind('click');
$('input[name="useDivisor"]').unbind('click');
$('input[name="useUnit"]').unbind('click');
$('select[name="varChartList"]').unbind('click');
$('a[href="#kibDivisor"]').unbind('click');
$('a[href="#mibDivisor"]').unbind('click');
$('a[href="#submitClearSeries"]').unbind('click');
$('a[href="#submitAddSeries"]').unbind('click');
$('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').off('click');
$('div.popupContent select[name="chartColumns"]').off('change');
$('div.popupContent select[name="gridChartRefresh"]').off('change');
$('a[href="#addNewChart"]').off('click');
$('a[href="#exportMonitorConfig"]').off('click');
$('a[href="#importMonitorConfig"]').off('click');
$('a[href="#clearMonitorConfig"]').off('click');
$('a[href="#pauseCharts"]').off('click');
$('a[href="#monitorInstructionsDialog"]').off('click');
$('input[name="chartType"]').off('click');
$('input[name="useDivisor"]').off('click');
$('input[name="useUnit"]').off('click');
$('select[name="varChartList"]').off('click');
$('a[href="#kibDivisor"]').off('click');
$('a[href="#mibDivisor"]').off('click');
$('a[href="#submitClearSeries"]').off('click');
$('a[href="#submitAddSeries"]').off('click');
// $("input#variableInput").destroy();
$('#chartPreset').unbind('click');
$('#chartStatusVar').unbind('click');
$('#chartPreset').off('click');
$('#chartStatusVar').off('click');
destroyGrid();
});
@ -1223,7 +1223,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
}
// time span selection
$('#gridchart' + runtime.chartAI).bind('jqplotMouseDown', function (ev, gridpos, datapos, neighbor, plot) {
$('#gridchart' + runtime.chartAI).on('jqplotMouseDown', function (ev, gridpos, datapos, neighbor, plot) {
drawTimeSpan = true;
selectionTimeDiff.push(datapos.xaxis);
if ($('#selection_box').length) {
@ -1242,7 +1242,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
.fadeIn();
});
$('#gridchart' + runtime.chartAI).bind('jqplotMouseUp', function (ev, gridpos, datapos, neighbor, plot) {
$('#gridchart' + runtime.chartAI).on('jqplotMouseUp', function (ev, gridpos, datapos, neighbor, plot) {
if (! drawTimeSpan || editMode) {
return;
}
@ -1261,7 +1261,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
drawTimeSpan = false;
});
$('#gridchart' + runtime.chartAI).bind('jqplotMouseMove', function (ev, gridpos, datapos, neighbor, plot) {
$('#gridchart' + runtime.chartAI).on('jqplotMouseMove', function (ev, gridpos, datapos, neighbor, plot) {
if (! drawTimeSpan || editMode) {
return;
}
@ -1274,7 +1274,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
}
});
$('#gridchart' + runtime.chartAI).bind('jqplotMouseLeave', function (ev, gridpos, datapos, neighbor, plot) {
$('#gridchart' + runtime.chartAI).on('jqplotMouseLeave', function (ev, gridpos, datapos, neighbor, plot) {
drawTimeSpan = false;
});

8
js/server_status_variables.js
View File

@ -9,10 +9,10 @@
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('server_status_variables.js', function () {
$('#filterAlert').unbind('change');
$('#filterText').unbind('keyup');
$('#filterCategory').unbind('change');
$('#dontFormat').unbind('change');
$('#filterAlert').off('change');
$('#filterText').off('keyup');
$('#filterCategory').off('change');
$('#dontFormat').off('change');
});
AJAX.registerOnload('server_status_variables.js', function () {

2
js/server_variables.js
View File

@ -4,7 +4,7 @@
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('server_variables.js', function () {
$('#filterText').unbind('keyup');
$('#filterText').off('keyup');
$(document).off('click', 'a.editLink');
$('#serverVariables').find('.var-name').find('a img').remove();
});

12
js/sql.js
View File

@ -103,20 +103,20 @@ function getFieldName($table_results, $this_field)
AJAX.registerTeardown('sql.js', function () {
$(document).off('click', 'a.delete_row.ajax');
$(document).off('submit', '.bookmarkQueryForm');
$('input#bkm_label').unbind('keyup');
$('input#bkm_label').off('keyup');
$(document).off('makegrid', ".sqlqueryresults");
$(document).off('stickycolumns', ".sqlqueryresults");
$("#togglequerybox").unbind('click');
$("#togglequerybox").off('click');
$(document).off('click', "#button_submit_query");
$(document).off('change', '#id_bookmark');
$("input[name=bookmark_variable]").unbind("keypress");
$("input[name=bookmark_variable]").off("keypress");
$(document).off('submit', "#sqlqueryform.ajax");
$(document).off('click', "input[name=navig].ajax");
$(document).off('submit', "form[name='displayOptionsForm'].ajax");
$(document).off('mouseenter', 'th.column_heading.pointer');
$(document).off('mouseleave', 'th.column_heading.pointer');
$(document).off('click', 'th.column_heading.marker');
$(window).unbind('scroll');
$(window).off('scroll');
$(document).off("keyup", ".filter_rows");
$(document).off('click', "#printView");
if (codemirror_editor) {
@ -252,7 +252,7 @@ AJAX.registerOnload('sql.js', function () {
var $stick_columns = initStickyColumns($table_results);
rearrangeStickyColumns($stick_columns, $table_results);
//adjust sticky columns on scroll
$(window).bind('scroll', function() {
$(window).on('scroll', function() {
handleStickyColumns($stick_columns, $table_results);
});
});
@ -340,7 +340,7 @@ AJAX.registerOnload('sql.js', function () {
*
* @memberOf jQuery
*/
$("input[name=bookmark_variable]").bind("keypress", function (event) {
$("input[name=bookmark_variable]").on("keypress", function (event) {
// force the 'Enter Key' to implicitly click the #button_submit_bookmark
var keycode = (event.keyCode ? event.keyCode : (event.which ? event.which : event.charCode));
if (keycode == 13) { // keycode for enter key

12
js/tbl_change.js
View File

@ -323,7 +323,7 @@ AJAX.registerTeardown('tbl_change.js', function () {
$(document).off('click', "input[name^='insert_ignore_']");
$(document).off('click', "input[name='gis_data[save]']");
$(document).off('click', 'input.checkbox_null');
$('select[name="submit_type"]').unbind('change');
$('select[name="submit_type"]').off('change');
$(document).off('change', "#insert_rows");
});
@ -453,7 +453,7 @@ AJAX.registerOnload('tbl_change.js', function () {
* when we are in edit-mode, and not in insert-mode(no previous value
* available).
*/
$('select[name="submit_type"]').bind('change', function () {
$('select[name="submit_type"]').on('change', function () {
var thisElemSubmitTypeVal = $(this).val();
var $table = $('table.insertRowTable');
var auto_increment_column = $table.find('input[name^="auto_increment"]');
@ -558,7 +558,7 @@ AJAX.registerOnload('tbl_change.js', function () {
$this_element.val($this_element.closest('tr').find('span.default_value').html());
}
$this_element
.unbind('change')
.off('change')
// Remove onchange attribute that was placed
// by tbl_change.php; it refers to the wrong row index
.attr('onchange', null)
@ -566,7 +566,7 @@ AJAX.registerOnload('tbl_change.js', function () {
// will change
.data('hashed_field', hashed_field)
.data('new_row_index', new_row_index)
.bind('change', function () {
.on('change', function () {
var $changed_element = $(this);
verificationsAfterFieldChange(
$changed_element.data('hashed_field'),
@ -580,12 +580,12 @@ AJAX.registerOnload('tbl_change.js', function () {
$this_element
// this event was bound earlier by jQuery but
// to the original row, not the cloned one, so unbind()
.unbind('click')
.off('click')
// Keep these values to be used when the element
// will be clicked
.data('hashed_field', hashed_field)
.data('new_row_index', new_row_index)
.bind('click', function () {
.on('click', function () {
var $changed_element = $(this);
nullify(
$changed_element.siblings('.nullify_code').val(),

26
js/tbl_chart.js
View File

@ -229,24 +229,24 @@ function onDataSeriesChange() {
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('tbl_chart.js', function () {
$('input[name="chartType"]').unbind('click');
$('input[name="barStacked"]').unbind('click');
$('input[name="chkAlternative"]').unbind('click');
$('input[name="chartTitle"]').unbind('focus').unbind('keyup').unbind('blur');
$('select[name="chartXAxis"]').unbind('change');
$('select[name="chartSeries"]').unbind('change');
$('select[name="chartSeriesColumn"]').unbind('change');
$('select[name="chartValueColumn"]').unbind('change');
$('input[name="xaxis_label"]').unbind('keyup');
$('input[name="yaxis_label"]').unbind('keyup');
$('#resizer').unbind('resizestop');
$('#tblchartform').unbind('submit');
$('input[name="chartType"]').off('click');
$('input[name="barStacked"]').off('click');
$('input[name="chkAlternative"]').off('click');
$('input[name="chartTitle"]').off('focus').off('keyup').off('blur');
$('select[name="chartXAxis"]').off('change');
$('select[name="chartSeries"]').off('change');
$('select[name="chartSeriesColumn"]').off('change');
$('select[name="chartValueColumn"]').off('change');
$('input[name="xaxis_label"]').off('keyup');
$('input[name="yaxis_label"]').off('keyup');
$('#resizer').off('resizestop');
$('#tblchartform').off('submit');
});
AJAX.registerOnload('tbl_chart.js', function () {
// handle manual resize
$('#resizer').bind('resizestop', function (event, ui) {
$('#resizer').on('resizestop', function (event, ui) {
// make room so that the handle will still appear
$('#querychart').height($('#resizer').height() * 0.96);
$('#querychart').width($('#resizer').width() * 0.96);

4
js/tbl_find_replace.js
View File

@ -2,8 +2,8 @@
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('tbl_find_replace.js', function () {
$('#find_replace_form').unbind('submit');
$('#toggle_find').unbind('click');
$('#find_replace_form').off('submit');
$('#toggle_find').off('click');
});
/**

6
js/tbl_gis_visualization.js
View File

@ -201,7 +201,7 @@ AJAX.registerTeardown('tbl_gis_visualization.js', function () {
$(document).off('click', '#right_arrow');
$(document).off('click', '#up_arrow');
$(document).off('click', '#down_arrow');
$('.vector').unbind('mousemove').unbind('mouseout');
$('.vector').off('mousemove').off('mouseout');
});
AJAX.registerOnload('tbl_gis_visualization.js', function () {
@ -340,7 +340,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
/**
* Detect the mousemove event and show tooltips.
*/
$('.vector').bind('mousemove', function (event) {
$('.vector').on('mousemove', function (event) {
var contents = $.trim(escapeHtml($(this).attr('name')));
$("#tooltip").remove();
if (contents !== '') {
@ -359,7 +359,7 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
/**
* Detect the mouseout event and hide tooltips.
*/
$('.vector').bind('mouseout', function (event) {
$('.vector').on('mouseout', function (event) {
$("#tooltip").remove();
});
});

6
js/tbl_select.js
View File

@ -50,9 +50,9 @@ function PMA_checkIfDataTypeNumericOrDate(data_type)
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('tbl_select.js', function () {
$('#togglesearchformlink').unbind('click');
$('#togglesearchformlink').off('click');
$(document).off('submit', "#tbl_search_form.ajax");
$('select.geom_func').unbind('change');
$('select.geom_func').off('change');
$(document).off('click', 'span.open_search_gis_editor');
$('body').off('click', 'select[name*="criteriaColumnOperators"]');
});
@ -69,7 +69,7 @@ AJAX.registerOnload('tbl_select.js', function () {
$('#togglesearchformlink')
.html(PMA_messages.strShowSearchCriteria)
.bind('click', function () {
.on('click', function () {
var $link = $(this);
$('#tbl_search_form').slideToggle();
if ($link.text() == PMA_messages.strHideSearchCriteria) {

18
js/tbl_zoom_plot_jqplot.js
View File

@ -109,16 +109,16 @@ function scrollToChart() {
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('tbl_zoom_plot_jqplot.js', function () {
$('#tableid_0').unbind('change');
$('#tableid_1').unbind('change');
$('#tableid_2').unbind('change');
$('#tableid_3').unbind('change');
$('#inputFormSubmitId').unbind('click');
$('#togglesearchformlink').unbind('click');
$('#tableid_0').off('change');
$('#tableid_1').off('change');
$('#tableid_2').off('change');
$('#tableid_3').off('change');
$('#inputFormSubmitId').off('click');
$('#togglesearchformlink').off('click');
$(document).off('keydown', "#dataDisplay :input");
$('button.button-reset').unbind('click');
$('div#resizer').unbind('resizestop');
$('div#querychart').unbind('jqplotDataClick');
$('button.button-reset').off('click');
$('div#resizer').off('resizestop');
$('div#querychart').off('jqplotDataClick');
});
AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {