X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..784f914b1e4b1c62d6657e86397c2e83bcee4295:/wp-includes/js/thickbox/thickbox.js
diff --git a/wp-includes/js/thickbox/thickbox.js b/wp-includes/js/thickbox/thickbox.js
index 5cc98688..164f72e6 100644
--- a/wp-includes/js/thickbox/thickbox.js
+++ b/wp-includes/js/thickbox/thickbox.js
@@ -8,9 +8,6 @@
if ( typeof tb_pathToImage != 'string' ) {
var tb_pathToImage = thickboxL10n.loadingAnimation;
}
-if ( typeof tb_closeImage != 'string' ) {
- var tb_closeImage = thickboxL10n.closeImage;
-}
/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
@@ -21,9 +18,16 @@ jQuery(document).ready(function(){
imgLoader.src = tb_pathToImage;
});
-//add thickbox to href & area elements that have a class of .thickbox
+/*
+ * Add thickbox to href & area elements that have a class of .thickbox.
+ * Remove the loading indicator when content in an iframe has loaded.
+ */
function tb_init(domChunk){
- jQuery(domChunk).live('click', tb_click);
+ jQuery( 'body' )
+ .on( 'click', domChunk, tb_click )
+ .on( 'thickbox:iframe:loaded', function() {
+ jQuery( '#TB_window' ).removeClass( 'thickbox-loading' );
+ });
}
function tb_click(){
@@ -37,18 +41,21 @@ function tb_click(){
function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
+ var $closeBtn;
+
try {
if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
jQuery("body","html").css({height: "100%", width: "100%"});
jQuery("html").css("overflow","hidden");
if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
- jQuery("body").append("");
+ jQuery("body").append("");
jQuery("#TB_overlay").click(tb_remove);
}
}else{//all others
if(document.getElementById("TB_overlay") === null){
- jQuery("body").append("");
+ jQuery("body").append("");
jQuery("#TB_overlay").click(tb_remove);
+ jQuery( 'body' ).addClass( 'modal-open' );
}
}
@@ -59,7 +66,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
}
if(caption===null){caption="";}
- jQuery("body").append("
");//add loader to the page
+ jQuery("body").append("
");//add loader to the page
jQuery('#TB_load').show();//show loader
var baseURL;
@@ -107,7 +114,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
imgPreloader.onload = function(){
imgPreloader.onload = null;
- // Resizing large images - orginal by Christian Montoya edited by me.
+ // Resizing large images - original by Christian Montoya edited by me.
var pagesize = tb_getPageSize();
var x = pagesize[0] - 150;
var y = pagesize[1] - 150;
@@ -132,7 +139,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
TB_WIDTH = imageWidth + 30;
TB_HEIGHT = imageHeight + 60;
- jQuery("#TB_window").append("" + "
");
jQuery("#TB_closeWindowButton").click(tb_remove);
@@ -159,11 +166,8 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
}
jQuery(document).bind('keydown.thickbox', function(e){
- e.stopImmediatePropagation();
-
if ( e.which == 27 ){ // close
- if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [{ event: e, what: 'thickbox', cb: tb_remove }] ) )
- tb_remove();
+ tb_remove();
} else if ( e.which == 190 ){ // display previous image
if(!(TB_NextHTML == "")){
@@ -182,7 +186,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_window").css({display:"block"}); //for safari using css instead of show
+ jQuery("#TB_window").css({'visibility':'visible'}); //for safari using css instead of show
};
imgPreloader.src = url;
@@ -191,8 +195,8 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
var queryString = url.replace(/^[^\?]+\??/,'');
var params = tb_parseQuery( queryString );
- TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
- TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
+ TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no parameters were added to URL
+ TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no parameters were added to URL
ajaxContentW = TB_WIDTH - 30;
ajaxContentH = TB_HEIGHT - 45;
@@ -200,15 +204,15 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
urlNoQuery = url.split('TB_');
jQuery("#TB_iframeContent").remove();
if(params['modal'] != "true"){//iframe no modal
- jQuery("#TB_window").append("
"+caption+"
");
+ jQuery("#TB_window").append("
"+caption+"
");
}else{//iframe modal
jQuery("#TB_overlay").unbind();
- jQuery("#TB_window").append("");
+ jQuery("#TB_window").append("");
}
}else{// not an iframe, ajax
- if(jQuery("#TB_window").css("display") != "block"){
+ if(jQuery("#TB_window").css("visibility") != "visible"){
if(params['modal'] != "true"){//ajax no modal
- jQuery("#TB_window").append("
"+caption+"
");
+ jQuery("#TB_window").append("
"+caption+"
");
}else{//ajax modal
jQuery("#TB_overlay").unbind();
jQuery("#TB_window").append("");
@@ -225,42 +229,48 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
if(url.indexOf('TB_inline') != -1){
jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children());
- jQuery("#TB_window").unload(function () {
+ jQuery("#TB_window").bind('tb_unload', function () {
jQuery('#' + params['inlineId']).append( jQuery("#TB_ajaxContent").children() ); // move elements back when you're finished
});
tb_position();
jQuery("#TB_load").remove();
- jQuery("#TB_window").css({display:"block"});
+ jQuery("#TB_window").css({'visibility':'visible'});
}else if(url.indexOf('TB_iframe') != -1){
tb_position();
- if(jQuery.browser.safari){//safari needs help because it will not fire iframe onload
- jQuery("#TB_load").remove();
- jQuery("#TB_window").css({display:"block"});
- }
+ jQuery("#TB_load").remove();
+ jQuery("#TB_window").css({'visibility':'visible'});
}else{
- jQuery("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method
+ var load_url = url;
+ load_url += -1 === url.indexOf('?') ? '?' : '&';
+ jQuery("#TB_ajaxContent").load(load_url += "random=" + (new Date().getTime()),function(){//to do a post change this load method
tb_position();
jQuery("#TB_load").remove();
tb_init("#TB_ajaxContent a.thickbox");
- jQuery("#TB_window").css({display:"block"});
+ jQuery("#TB_window").css({'visibility':'visible'});
});
}
}
if(!params['modal']){
- jQuery(document).bind('keyup.thickbox', function(e){
-
+ jQuery(document).bind('keydown.thickbox', function(e){
if ( e.which == 27 ){ // close
- e.stopImmediatePropagation();
- if ( ! jQuery(document).triggerHandler( 'wp_CloseOnEscape', [{ event: e, what: 'thickbox', cb: tb_remove }] ) )
- tb_remove();
-
+ tb_remove();
return false;
}
});
}
+ $closeBtn = jQuery( '#TB_closeWindowButton' );
+ /*
+ * If the native Close button icon is visible, move focus on the button
+ * (e.g. in the Network Admin Themes screen).
+ * In other admin screens is hidden and replaced by a different icon.
+ */
+ if ( $closeBtn.find( '.tb-close-icon' ).is( ':visible' ) ) {
+ $closeBtn.focus();
+ }
+
} catch(e) {
//nothing here
}
@@ -269,13 +279,17 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
//helper functions below
function tb_showIframe(){
jQuery("#TB_load").remove();
- jQuery("#TB_window").css({display:"block"});
+ jQuery("#TB_window").css({'visibility':'visible'}).trigger( 'thickbox:iframe:loaded' );
}
function tb_remove() {
jQuery("#TB_imageOff").unbind("click");
jQuery("#TB_closeWindowButton").unbind("click");
- jQuery("#TB_window").fadeOut("fast",function(){jQuery('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
+ jQuery( '#TB_window' ).fadeOut( 'fast', function() {
+ jQuery( '#TB_window, #TB_overlay, #TB_HideSelect' ).trigger( 'tb_unload' ).unbind().remove();
+ jQuery( 'body' ).trigger( 'thickbox:removed' );
+ });
+ jQuery( 'body' ).removeClass( 'modal-open' );
jQuery("#TB_load").remove();
if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
jQuery("body","html").css({height: "auto", width: "auto"});