Skip to content

Commit

Permalink
replace deprecated delegate() calls
Browse files Browse the repository at this point in the history
The delegate() call is deprecated in jQuery 3. This replaces it with the
on() call.
  • Loading branch information
splitbrain committed Nov 26, 2016
1 parent 46b9e00 commit 568cdec
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion lib/scripts/linkwiz.js
Expand Up @@ -59,7 +59,7 @@ var dw_linkwiz = {
// attach event handlers
jQuery('#link__wiz .ui-dialog-titlebar-close').click(dw_linkwiz.hide);
dw_linkwiz.$entry.keyup(dw_linkwiz.onEntry);
jQuery(dw_linkwiz.result).delegate('a', 'click', dw_linkwiz.onResultClick);
jQuery(dw_linkwiz.result).on('click', 'a', dw_linkwiz.onResultClick);
},

/**
Expand Down
37 changes: 18 additions & 19 deletions lib/scripts/media.js
Expand Up @@ -40,13 +40,12 @@ var dw_mediamanager = {

// add the action to autofill the "upload as" field
$content
.delegate('#upload__file', 'change', dw_mediamanager.suggest)
.on('change', '#upload__file', dw_mediamanager.suggest)
// Attach the image selector action to all links
.delegate('a.select', 'click', dw_mediamanager.select)
.on('click', 'a.select', dw_mediamanager.select)
// Attach deletion confirmation dialog to the delete buttons
.delegate('#media__content a.btn_media_delete', 'click',
dw_mediamanager.confirmattach)
.delegate('#mediamanager__done_form', 'submit', dw_mediamanager.list);
.on('click', '#media__content a.btn_media_delete', dw_mediamanager.confirmattach)
.on('submit', '#mediamanager__done_form', dw_mediamanager.list);

$tree.dw_tree({
toggle_selector: 'img',
Expand All @@ -66,7 +65,7 @@ var dw_mediamanager = {
$clicky.attr('src', DOKU_BASE + 'lib/images/' + (opening ? 'minus' : 'plus') + '.gif');
}
});
$tree.delegate('a', 'click', dw_mediamanager.list);
$tree.on('click', 'a', dw_mediamanager.list);

// Init view property
dw_mediamanager.set_fileview_list();
Expand All @@ -79,32 +78,32 @@ var dw_mediamanager = {
// changing opened tab in the file list panel
var $page = jQuery('#mediamanager__page');
$page.find('div.filelist')
.delegate('ul.tabs a', 'click', dw_mediamanager.list)
.on('click', 'ul.tabs a', dw_mediamanager.list)
// loading file details
.delegate('div.panelContent a', 'click', dw_mediamanager.details)
.on('click', 'div.panelContent a', dw_mediamanager.details)
// search form
.delegate('#dw__mediasearch', 'submit', dw_mediamanager.list)
.on('submit', '#dw__mediasearch', dw_mediamanager.list)
// "upload as" field autofill
.delegate('#upload__file', 'change', dw_mediamanager.suggest)
.on('change', '#upload__file', dw_mediamanager.suggest)
// uploaded images
.delegate('.qq-upload-file a', 'click', dw_mediamanager.details);
.on('click', '.qq-upload-file a', dw_mediamanager.details);

// changing opened tab in the file details panel
$page.find('div.file')
.delegate('ul.tabs a', 'click', dw_mediamanager.details)
.on('click', 'ul.tabs a', dw_mediamanager.details)
// "update new version" button
.delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list)
.on('submit', '#mediamanager__btn_update', dw_mediamanager.list)
// revisions form
.delegate('#page__revisions', 'submit', dw_mediamanager.details)
.delegate('#page__revisions a', 'click', dw_mediamanager.details)
.on('submit', '#page__revisions', dw_mediamanager.details)
.on('click', '#page__revisions a', dw_mediamanager.details)
// meta edit form
.delegate('#mediamanager__save_meta', 'submit', dw_mediamanager.details)
.on('submit', '#mediamanager__save_meta', dw_mediamanager.details)
// delete button
.delegate('#mediamanager__btn_delete', 'submit', dw_mediamanager.details)
.on('submit', '#mediamanager__btn_delete', dw_mediamanager.details)
// "restore this version" button
.delegate('#mediamanager__btn_restore', 'submit', dw_mediamanager.details)
.on('submit', '#mediamanager__btn_restore', dw_mediamanager.details)
// less/more recent buttons in media revisions form
.delegate('.btn_newer, .btn_older', 'submit', dw_mediamanager.details);
.on('submit', '.btn_newer, .btn_older', dw_mediamanager.details);

dw_mediamanager.update_resizable();
dw_mediamanager.layout_width = $page.width();
Expand Down
2 changes: 1 addition & 1 deletion lib/scripts/tree.js
Expand Up @@ -12,7 +12,7 @@ jQuery.fn.dw_tree = function(overrides) {
toggle_selector: 'a.idx_dir',

init: function () {
this.$obj.delegate(this.toggle_selector, 'click', this,
this.$obj.on('click', this.toggle_selector, this,
this.toggle);
jQuery('ul:first', this.$obj).attr('role', 'tree');
jQuery('ul', this.$obj).not(':first').attr('role', 'group');
Expand Down

0 comments on commit 568cdec

Please sign in to comment.