External Libraries: Further fix jQuery deprecations in WordPress core.
This addresses `JQMIGRATE` warnings in some admin files and the Thickbox library. Follow-up to [50001], [50270]. Props bordoni, poena. See #51812. Built from https://develop.svn.wordpress.org/trunk@50367 git-svn-id: http://core.svn.wordpress.org/trunk@49978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
@@ -9054,7 +9054,7 @@ Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp
|
||||
// Clear the selection and move focus back to the trigger.
|
||||
event.clearSelection();
|
||||
// Handle ClipboardJS focus bug, see https://github.com/zenorocha/clipboard.js/issues/680
|
||||
triggerElement.focus();
|
||||
triggerElement.trigger( 'focus' );
|
||||
|
||||
// Show success visual feedback.
|
||||
clearTimeout( successTimeout );
|
||||
@@ -9111,18 +9111,18 @@ Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp
|
||||
*/
|
||||
moveFocus: function() {
|
||||
if ( this.previousAttachment.length ) {
|
||||
this.previousAttachment.focus();
|
||||
this.previousAttachment.trigger( 'focus' );
|
||||
return;
|
||||
}
|
||||
|
||||
if ( this.nextAttachment.length ) {
|
||||
this.nextAttachment.focus();
|
||||
this.nextAttachment.trigger( 'focus' );
|
||||
return;
|
||||
}
|
||||
|
||||
// Fallback: move focus to the "Select Files" button in the media modal.
|
||||
if ( this.controller.uploader && this.controller.uploader.$browser ) {
|
||||
this.controller.uploader.$browser.focus();
|
||||
this.controller.uploader.$browser.trigger( 'focus' );
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -9139,7 +9139,7 @@ Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp
|
||||
// Last fallback: make the frame focusable and move focus to it.
|
||||
$( '.media-frame' )
|
||||
.attr( 'tabindex', '-1' )
|
||||
.focus();
|
||||
.trigger( 'focus' );
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
2
wp-includes/js/media-views.min.js
vendored
2
wp-includes/js/media-views.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -35,7 +35,7 @@ function tb_click(){
|
||||
var a = this.href || this.alt;
|
||||
var g = this.rel || false;
|
||||
tb_show(t,a,g);
|
||||
this.blur();
|
||||
this.trigger( 'blur' );
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -49,12 +49,12 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
jQuery("html").css("overflow","hidden");
|
||||
if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
|
||||
jQuery("body").append("<iframe id='TB_HideSelect'>"+thickboxL10n.noiframes+"</iframe><div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
|
||||
jQuery("#TB_overlay").click(tb_remove);
|
||||
jQuery("#TB_overlay").trigger( 'click', tb_remove );
|
||||
}
|
||||
}else{//all others
|
||||
if(document.getElementById("TB_overlay") === null){
|
||||
jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
|
||||
jQuery("#TB_overlay").click(tb_remove);
|
||||
jQuery("#TB_overlay").trigger( 'click', tb_remove );
|
||||
jQuery( 'body' ).addClass( 'modal-open' );
|
||||
}
|
||||
}
|
||||
@@ -141,17 +141,17 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
TB_HEIGHT = imageHeight + 60;
|
||||
jQuery("#TB_window").append("<a href='' id='TB_ImageOff'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div>");
|
||||
|
||||
jQuery("#TB_closeWindowButton").click(tb_remove);
|
||||
jQuery("#TB_closeWindowButton").trigger( 'click', tb_remove );
|
||||
|
||||
if (!(TB_PrevHTML === "")) {
|
||||
function goPrev(){
|
||||
if(jQuery(document).unbind("click",goPrev)){jQuery(document).unbind("click",goPrev);}
|
||||
if(jQuery(document).off("click",goPrev)){jQuery(document).off("click",goPrev);}
|
||||
jQuery("#TB_window").remove();
|
||||
jQuery("body").append("<div id='TB_window'></div>");
|
||||
tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
|
||||
return false;
|
||||
}
|
||||
jQuery("#TB_prev").click(goPrev);
|
||||
jQuery("#TB_prev").trigger( 'click', goPrev );
|
||||
}
|
||||
|
||||
if (!(TB_NextHTML === "")) {
|
||||
@@ -161,22 +161,22 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
tb_show(TB_NextCaption, TB_NextURL, imageGroup);
|
||||
return false;
|
||||
}
|
||||
jQuery("#TB_next").click(goNext);
|
||||
jQuery("#TB_next").trigger( 'click', goNext );
|
||||
|
||||
}
|
||||
|
||||
jQuery(document).bind('keydown.thickbox', function(e){
|
||||
jQuery(document).on('keydown.thickbox', function(e){
|
||||
if ( e.which == 27 ){ // close
|
||||
tb_remove();
|
||||
|
||||
} else if ( e.which == 190 ){ // display previous image
|
||||
if(!(TB_NextHTML == "")){
|
||||
jQuery(document).unbind('thickbox');
|
||||
jQuery(document).off('thickbox');
|
||||
goNext();
|
||||
}
|
||||
} else if ( e.which == 188 ){ // display next image
|
||||
if(!(TB_PrevHTML == "")){
|
||||
jQuery(document).unbind('thickbox');
|
||||
jQuery(document).off('thickbox');
|
||||
goPrev();
|
||||
}
|
||||
}
|
||||
@@ -185,7 +185,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
|
||||
tb_position();
|
||||
jQuery("#TB_load").remove();
|
||||
jQuery("#TB_ImageOff").click(tb_remove);
|
||||
jQuery("#TB_ImageOff").trigger( 'click', tb_remove );
|
||||
jQuery("#TB_window").css({'visibility':'visible'}); //for safari using css instead of show
|
||||
};
|
||||
|
||||
@@ -206,7 +206,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
if(params['modal'] != "true"){//iframe no modal
|
||||
jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div></div><iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >"+thickboxL10n.noiframes+"</iframe>");
|
||||
}else{//iframe modal
|
||||
jQuery("#TB_overlay").unbind();
|
||||
jQuery("#TB_overlay").off();
|
||||
jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>"+thickboxL10n.noiframes+"</iframe>");
|
||||
}
|
||||
}else{// not an iframe, ajax
|
||||
@@ -214,7 +214,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
if(params['modal'] != "true"){//ajax no modal
|
||||
jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
|
||||
}else{//ajax modal
|
||||
jQuery("#TB_overlay").unbind();
|
||||
jQuery("#TB_overlay").off();
|
||||
jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
|
||||
}
|
||||
}else{//this means the window is already up, we are just loading new content via ajax
|
||||
@@ -225,11 +225,11 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
}
|
||||
}
|
||||
|
||||
jQuery("#TB_closeWindowButton").click(tb_remove);
|
||||
jQuery("#TB_closeWindowButton").trigger( 'click', tb_remove );
|
||||
|
||||
if(url.indexOf('TB_inline') != -1){
|
||||
jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children());
|
||||
jQuery("#TB_window").bind('tb_unload', function () {
|
||||
jQuery("#TB_window").on('tb_unload', function () {
|
||||
jQuery('#' + params['inlineId']).append( jQuery("#TB_ajaxContent").children() ); // move elements back when you're finished
|
||||
});
|
||||
tb_position();
|
||||
@@ -253,7 +253,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
}
|
||||
|
||||
if(!params['modal']){
|
||||
jQuery(document).bind('keydown.thickbox', function(e){
|
||||
jQuery(document).on('keydown.thickbox', function(e){
|
||||
if ( e.which == 27 ){ // close
|
||||
tb_remove();
|
||||
return false;
|
||||
@@ -268,7 +268,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
|
||||
* In other admin screens is hidden and replaced by a different icon.
|
||||
*/
|
||||
if ( $closeBtn.find( '.tb-close-icon' ).is( ':visible' ) ) {
|
||||
$closeBtn.focus();
|
||||
$closeBtn.trigger( 'focus' );
|
||||
}
|
||||
|
||||
} catch(e) {
|
||||
@@ -283,10 +283,10 @@ function tb_showIframe(){
|
||||
}
|
||||
|
||||
function tb_remove() {
|
||||
jQuery("#TB_imageOff").unbind("click");
|
||||
jQuery("#TB_closeWindowButton").unbind("click");
|
||||
jQuery("#TB_imageOff").off("click");
|
||||
jQuery("#TB_closeWindowButton").off("click");
|
||||
jQuery( '#TB_window' ).fadeOut( 'fast', function() {
|
||||
jQuery( '#TB_window, #TB_overlay, #TB_HideSelect' ).trigger( 'tb_unload' ).unbind().remove();
|
||||
jQuery( '#TB_window, #TB_overlay, #TB_HideSelect' ).trigger( 'tb_unload' ).off().remove();
|
||||
jQuery( 'body' ).trigger( 'thickbox:removed' );
|
||||
});
|
||||
jQuery( 'body' ).removeClass( 'modal-open' );
|
||||
@@ -295,7 +295,7 @@ function tb_remove() {
|
||||
jQuery("body","html").css({height: "auto", width: "auto"});
|
||||
jQuery("html").css("overflow","");
|
||||
}
|
||||
jQuery(document).unbind('.thickbox');
|
||||
jQuery(document).off('.thickbox');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
buttons: function( event, t ) {
|
||||
var button = $('<a class="close" href="#"></a>').text( wp.i18n.__( 'Dismiss' ) );
|
||||
|
||||
return button.bind( 'click.pointer', function(e) {
|
||||
return button.on( 'click.pointer', function(e) {
|
||||
e.preventDefault();
|
||||
t.element.pointer('close');
|
||||
});
|
||||
|
||||
2
wp-includes/js/wp-pointer.min.js
vendored
2
wp-includes/js/wp-pointer.min.js
vendored
@@ -1,2 +1,2 @@
|
||||
/*! This file is auto-generated */
|
||||
!function(o){var i=0,e=9999;o.widget("wp.pointer",{options:{pointerClass:"wp-pointer",pointerWidth:320,content:function(){return o(this).text()},buttons:function(t,i){return o('<a class="close" href="#"></a>').text(wp.i18n.__("Dismiss")).bind("click.pointer",function(t){t.preventDefault(),i.element.pointer("close")})},position:"top",show:function(t,i){i.pointer.show(),i.opened()},hide:function(t,i){i.pointer.hide(),i.closed()},document:document},_create:function(){var t;this.content=o('<div class="wp-pointer-content"></div>'),this.arrow=o('<div class="wp-pointer-arrow"><div class="wp-pointer-arrow-inner"></div></div>'),t="absolute",this.element.parents().add(this.element).filter(function(){return"fixed"===o(this).css("position")}).length&&(t="fixed"),this.pointer=o("<div />").append(this.content).append(this.arrow).attr("id","wp-pointer-"+i++).addClass(this.options.pointerClass).css({position:t,width:this.options.pointerWidth+"px",display:"none"}).appendTo(this.options.document.body)},_setOption:function(t,i){var e=this.options,n=this.pointer;"document"===t&&i!==e.document?n.detach().appendTo(i.body):"pointerClass"===t&&n.removeClass(e.pointerClass).addClass(i),o.Widget.prototype._setOption.apply(this,arguments),"position"===t?this.reposition():"content"===t&&this.active&&this.update()},destroy:function(){this.pointer.remove(),o.Widget.prototype.destroy.call(this)},widget:function(){return this.pointer},update:function(i){var e=this,t=this.options,n=o.Deferred();if(!t.disabled)return n.done(function(t){e._update(i,t)}),(t="string"==typeof t.content?t.content:t.content.call(this.element[0],n.resolve,i,this._handoff()))&&n.resolve(t),n.promise()},_update:function(t,i){var e=this.options;i&&(this.pointer.stop(),this.content.html(i),(t=e.buttons.call(this.element[0],t,this._handoff()))&&t.wrap('<div class="wp-pointer-buttons" />').parent().appendTo(this.content),this.reposition())},reposition:function(){var t;this.options.disabled||(t=this._processPosition(this.options.position),this.pointer.css({top:0,left:0,zIndex:e++}).show().position(o.extend({of:this.element,collision:"fit none"},t)),this.repoint())},repoint:function(){var t=this.options;t.disabled||(t="string"==typeof t.position?t.position:t.position.edge,this.pointer[0].className=this.pointer[0].className.replace(/wp-pointer-[^\s'"]*/,""),this.pointer.addClass("wp-pointer-"+t))},_processPosition:function(t){var i={top:"bottom",bottom:"top",left:"right",right:"left"},t="string"==typeof t?{edge:t+""}:o.extend({},t);return t.edge&&("top"==t.edge||"bottom"==t.edge?(t.align=t.align||"left",t.at=t.at||t.align+" "+i[t.edge],t.my=t.my||t.align+" "+t.edge):(t.align=t.align||"top",t.at=t.at||i[t.edge]+" "+t.align,t.my=t.my||t.edge+" "+t.align)),t},open:function(t){var i=this,e=this.options;this.active||e.disabled||this.element.is(":hidden")||this.update().done(function(){i._open(t)})},_open:function(t){var i=this,e=this.options;this.active||e.disabled||this.element.is(":hidden")||(this.active=!0,this._trigger("open",t,this._handoff()),this._trigger("show",t,this._handoff({opened:function(){i._trigger("opened",t,i._handoff())}})))},close:function(t){var i;this.active&&!this.options.disabled&&((i=this).active=!1,this._trigger("close",t,this._handoff()),this._trigger("hide",t,this._handoff({closed:function(){i._trigger("closed",t,i._handoff())}})))},sendToTop:function(){this.active&&this.pointer.css("z-index",e++)},toggle:function(t){this.pointer.is(":hidden")?this.open(t):this.close(t)},_handoff:function(t){return o.extend({pointer:this.pointer,element:this.element},t)}})}(jQuery);
|
||||
!function(o){var i=0,e=9999;o.widget("wp.pointer",{options:{pointerClass:"wp-pointer",pointerWidth:320,content:function(){return o(this).text()},buttons:function(t,i){return o('<a class="close" href="#"></a>').text(wp.i18n.__("Dismiss")).on("click.pointer",function(t){t.preventDefault(),i.element.pointer("close")})},position:"top",show:function(t,i){i.pointer.show(),i.opened()},hide:function(t,i){i.pointer.hide(),i.closed()},document:document},_create:function(){var t;this.content=o('<div class="wp-pointer-content"></div>'),this.arrow=o('<div class="wp-pointer-arrow"><div class="wp-pointer-arrow-inner"></div></div>'),t="absolute",this.element.parents().add(this.element).filter(function(){return"fixed"===o(this).css("position")}).length&&(t="fixed"),this.pointer=o("<div />").append(this.content).append(this.arrow).attr("id","wp-pointer-"+i++).addClass(this.options.pointerClass).css({position:t,width:this.options.pointerWidth+"px",display:"none"}).appendTo(this.options.document.body)},_setOption:function(t,i){var e=this.options,n=this.pointer;"document"===t&&i!==e.document?n.detach().appendTo(i.body):"pointerClass"===t&&n.removeClass(e.pointerClass).addClass(i),o.Widget.prototype._setOption.apply(this,arguments),"position"===t?this.reposition():"content"===t&&this.active&&this.update()},destroy:function(){this.pointer.remove(),o.Widget.prototype.destroy.call(this)},widget:function(){return this.pointer},update:function(i){var e=this,t=this.options,n=o.Deferred();if(!t.disabled)return n.done(function(t){e._update(i,t)}),(t="string"==typeof t.content?t.content:t.content.call(this.element[0],n.resolve,i,this._handoff()))&&n.resolve(t),n.promise()},_update:function(t,i){var e=this.options;i&&(this.pointer.stop(),this.content.html(i),(t=e.buttons.call(this.element[0],t,this._handoff()))&&t.wrap('<div class="wp-pointer-buttons" />').parent().appendTo(this.content),this.reposition())},reposition:function(){var t;this.options.disabled||(t=this._processPosition(this.options.position),this.pointer.css({top:0,left:0,zIndex:e++}).show().position(o.extend({of:this.element,collision:"fit none"},t)),this.repoint())},repoint:function(){var t=this.options;t.disabled||(t="string"==typeof t.position?t.position:t.position.edge,this.pointer[0].className=this.pointer[0].className.replace(/wp-pointer-[^\s'"]*/,""),this.pointer.addClass("wp-pointer-"+t))},_processPosition:function(t){var i={top:"bottom",bottom:"top",left:"right",right:"left"},t="string"==typeof t?{edge:t+""}:o.extend({},t);return t.edge&&("top"==t.edge||"bottom"==t.edge?(t.align=t.align||"left",t.at=t.at||t.align+" "+i[t.edge],t.my=t.my||t.align+" "+t.edge):(t.align=t.align||"top",t.at=t.at||i[t.edge]+" "+t.align,t.my=t.my||t.edge+" "+t.align)),t},open:function(t){var i=this,e=this.options;this.active||e.disabled||this.element.is(":hidden")||this.update().done(function(){i._open(t)})},_open:function(t){var i=this,e=this.options;this.active||e.disabled||this.element.is(":hidden")||(this.active=!0,this._trigger("open",t,this._handoff()),this._trigger("show",t,this._handoff({opened:function(){i._trigger("opened",t,i._handoff())}})))},close:function(t){var i;this.active&&!this.options.disabled&&((i=this).active=!1,this._trigger("close",t,this._handoff()),this._trigger("hide",t,this._handoff({closed:function(){i._trigger("closed",t,i._handoff())}})))},sendToTop:function(){this.active&&this.pointer.css("z-index",e++)},toggle:function(t){this.pointer.is(":hidden")?this.open(t):this.close(t)},_handoff:function(t){return o.extend({pointer:this.pointer,element:this.element},t)}})}(jQuery);
|
||||
Reference in New Issue
Block a user