WordPress 4.1

[autoinstalls/wordpress.git] / wp-includes / js / thickbox / thickbox.js

diff --git a/wp-includes/js/thickbox/thickbox.js b/wp-includes/js/thickbox/thickbox.js
index 995c60fee2691eb52133333a9a4e920f7cd23102..09c8a993a159241f4f5cf6058677a272ddc4483a 100644 (file)
--- a/wp-includes/js/thickbox/thickbox.js
+++ b/wp-includes/js/thickbox/thickbox.js
@@ -20,7 +20,7 @@ jQuery(document).ready(function(){
 
 //add thickbox to href & area elements that have a class of .thickbox
 function tb_init(domChunk){
-       jQuery(domChunk).live('click', tb_click);
+       jQuery('body').on('click', domChunk, tb_click);
 }
 
 function tb_click(){
@@ -46,6 +46,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
                        if(document.getElementById("TB_overlay") === null){
                                jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>");
                                jQuery("#TB_overlay").click(tb_remove);
+                               jQuery( 'body' ).addClass( 'modal-open' );
                        }
                }
 
@@ -104,7 +105,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;
@@ -129,7 +130,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("<a href='' id='TB_ImageOff' title='"+thickboxL10n.close+"'><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'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><div class='tb-close-icon'></div></a></div>");
+                       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'><a href='#' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><div class='tb-close-icon'></div></a></div>");
 
                        jQuery("#TB_closeWindowButton").click(tb_remove);
 
@@ -156,11 +157,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 == "")){
@@ -188,8 +186,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;
 
@@ -197,7 +195,7 @@ 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("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><div class='tb-close-icon'></div></a></div></div><iframe frameborder='0' hspace='0' 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>");
+                                               jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><div class='tb-close-icon'></div></a></div></div><iframe frameborder='0' hspace='0' 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_window").append("<iframe frameborder='0' hspace='0' 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>");
@@ -230,10 +228,8 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
                                        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({'visibility':'visible'});
-                                       }
+                                       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
                                                tb_position();
@@ -246,13 +242,9 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
                }
 
                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;
                                }
                        });
@@ -273,6 +265,7 @@ 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("tb_unload").unbind().remove();});
+       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"});