Wordpress 3.6

[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..e874446b80dcce06f8f2b3a29cb9d101978ced5a 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(){
@@ -230,10 +230,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();