Changeset 18848
- Timestamp:
- 09/30/2011 10:24:34 PM (13 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/js/thickbox/thickbox.js
r18482 r18848 183 183 jQuery("#TB_load").remove(); 184 184 jQuery("#TB_ImageOff").click(tb_remove); 185 jQuery("#TB_window").css({ display:"block"}); //for safari using css instead of show185 jQuery("#TB_window").css({'visibility':'visible'}); //for safari using css instead of show 186 186 }; 187 187 … … 207 207 } 208 208 }else{// not an iframe, ajax 209 if(jQuery("#TB_window").css(" display") != "block"){209 if(jQuery("#TB_window").css("visibility") != "visible"){ 210 210 if(params['modal'] != "true"){//ajax no modal 211 211 jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><img src='" + tb_closeImage + "' /></a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>"); … … 231 231 tb_position(); 232 232 jQuery("#TB_load").remove(); 233 jQuery("#TB_window").css({ display:"block"});233 jQuery("#TB_window").css({'visibility':'visible'}); 234 234 }else if(url.indexOf('TB_iframe') != -1){ 235 235 tb_position(); 236 236 if(jQuery.browser.safari){//safari needs help because it will not fire iframe onload 237 237 jQuery("#TB_load").remove(); 238 jQuery("#TB_window").css({ display:"block"});238 jQuery("#TB_window").css({'visibility':'visible'}); 239 239 } 240 240 }else{ … … 243 243 jQuery("#TB_load").remove(); 244 244 tb_init("#TB_ajaxContent a.thickbox"); 245 jQuery("#TB_window").css({ display:"block"});245 jQuery("#TB_window").css({'visibility':'visible'}); 246 246 }); 247 247 } -
trunk/wp-includes/script-loader.php
r18837 r18848 166 166 $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102', 1 ); 167 167 168 $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110 528', 1 );168 $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110930', 1 ); 169 169 $scripts->add_script_data( 'thickbox', 'thickboxL10n', array( 170 170 'next' => __('Next >'),
Note: See TracChangeset
for help on using the changeset viewer.