vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 12:50:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silence error if TB iframe is loaded from another domain, see #6883

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12634 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2010-01-07 05:55:26 +00:00
parent 7196d7fbe8
commit 74ae03486d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/js/swfupload/handlers.dev.js
+9 -4
View File
@@ -25,8 +25,11 @@ function fileQueued(fileObj) {
}
function uploadStart(fileObj) {
if ( typeof topWin.tb_remove != 'undefined' )
topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove);
try {
if ( typeof topWin.tb_remove != 'undefined' )
topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove);
} catch(e){}
return true;
}
@@ -46,8 +49,10 @@ function prepareMediaItem(fileObj, serverData) {
jQuery('.bar', item).remove();
jQuery('.progress', item).hide();
if ( typeof topWin.tb_remove != 'undefined' )
topWin.jQuery('#TB_overlay').click(topWin.tb_remove);
try {
if ( typeof topWin.tb_remove != 'undefined' )
topWin.jQuery('#TB_overlay').click(topWin.tb_remove);
} catch(e){}
// Old style: Append the HTML returned by the server -- thumbnail and form inputs
if ( isNaN(serverData) || !serverData ) {
wp-includes/js/swfupload/handlers.js
+1 -1
View File
File diff suppressed because one or more lines are too long