X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..784f914b1e4b1c62d6657e86397c2e83bcee4295:/wp-includes/js/thickbox/thickbox.js diff --git a/wp-includes/js/thickbox/thickbox.js b/wp-includes/js/thickbox/thickbox.js index b4ff0309..164f72e6 100644 --- a/wp-includes/js/thickbox/thickbox.js +++ b/wp-includes/js/thickbox/thickbox.js @@ -6,10 +6,7 @@ */ if ( typeof tb_pathToImage != 'string' ) { - var tb_pathToImage = "../wp-includes/js/thickbox/loadingAnimation.gif"; -} -if ( typeof tb_closeImage != 'string' ) { - var tb_closeImage = "../wp-includes/js/thickbox/tb-close.png"; + var tb_pathToImage = thickboxL10n.loadingAnimation; } /*!!!!!!!!!!!!!!!!! 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_window").append(""+thickboxL10n.close+"" + " "); jQuery("#TB_closeWindowButton").click(tb_remove); @@ -158,31 +165,28 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic } - document.onkeydown = function(e){ - if (e == null) { // ie - keycode = event.keyCode; - } else { // mozilla - keycode = e.which; - } - if(keycode == 27){ // close + jQuery(document).bind('keydown.thickbox', function(e){ + if ( e.which == 27 ){ // close tb_remove(); - } else if(keycode == 190){ // display previous image + + } else if ( e.which == 190 ){ // display previous image if(!(TB_NextHTML == "")){ - document.onkeydown = ""; + jQuery(document).unbind('thickbox'); goNext(); } - } else if(keycode == 188){ // display next image + } else if ( e.which == 188 ){ // display next image if(!(TB_PrevHTML == "")){ - document.onkeydown = ""; + jQuery(document).unbind('thickbox'); goPrev(); } } - }; + return false; + }); 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(""); + jQuery("#TB_window").append("