WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename the problematic "unload" event in Thickbox to "tb_unload", making it a true custom event, fixes #19189 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-26 17:49:50 +00:00
parent a55d901b12
commit 2d97f8794a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/js/thickbox/thickbox.js
View File

@ -225,7 +225,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
if(url.indexOf('TB_inline') != -1){ if(url.indexOf('TB_inline') != -1){
jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children()); 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 jQuery('#' + params['inlineId']).append( jQuery("#TB_ajaxContent").children() ); // move elements back when you're finished
}); });
tb_position(); tb_position();
@ -275,7 +275,7 @@ function tb_showIframe(){
function tb_remove() { function tb_remove() {
jQuery("#TB_imageOff").unbind("click"); jQuery("#TB_imageOff").unbind("click");
jQuery("#TB_closeWindowButton").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("#TB_load").remove(); jQuery("#TB_load").remove();
if (typeof document.body.style.maxHeight == "undefined") {//if IE 6 if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
jQuery("body","html").css({height: "auto", width: "auto"}); jQuery("body","html").css({height: "auto", width: "auto"});