Index: branches/1.3.x/platform/inc/jquery/thickbox/thickbox.js =================================================================== diff -u -N -r15478 -r15893 --- branches/1.3.x/platform/inc/jquery/thickbox/thickbox.js (.../thickbox.js) (revision 15478) +++ branches/1.3.x/platform/inc/jquery/thickbox/thickbox.js (.../thickbox.js) (revision 15893) @@ -13,13 +13,13 @@ // preload image TB.imgLoader = new Image(); - TB.imgLoader.src = inportalBase + 'inc/jquery/thickbox/loadingAnimation.gif'; + TB.imgLoader.src = inportalBase + 'inc/jquery/thickbox/images/loadingAnimation.gif'; } ); function TB () { this.imgLoader = null; - this.pathToImage = inportalBase + 'inc/jquery/thickbox/loadingAnimation.gif'; + this.pathToImage = inportalBase + 'inc/jquery/thickbox/images/loadingAnimation.gif'; this.Width = null; this.Height = null; @@ -64,11 +64,7 @@ } } - if (TB.detectMacXFF()) { - $('#TB_overlay').addClass('TB_overlayMacFFBGHack'); // use png overlay so hide flash - } else { - $('#TB_overlay').addClass('TB_overlayBG'); // use background and opacity - } + $('#TB_overlay').addClass('TB_overlayBG'); // use background and opacity if (params.caption === null) { params.caption = ''; @@ -304,11 +300,11 @@ } else if (params.url.indexOf('TB_iframe') != -1) { TB.position(); - if ($.browser.safari) { + /*if ($.browser.safari) { // safari needs help because it will not fire iframe onload $('#TB_load').remove(); $('#TB_window').css('display', 'block'); - } + }*/ } else { var $content_url = params.url + '&random=' + (new Date().getTime()); @@ -329,22 +325,6 @@ } ); } - - /*$('#TB_ajaxContent').load( - params.url += '&random=' + (new Date().getTime()), - params.postParams, - function() { - //to do a post change this load method - TB.position(); - $('#TB_load').remove(); - TB.init('#TB_ajaxContent a.thickbox'); - $('#TB_window').css('display', 'block'); - - if ( $.isFunction(params.showCallback) ) { - params.showCallback(); - } - } - );*/ } } @@ -398,7 +378,7 @@ $('#TB_window').fadeOut( 'fast', function(){ - $('#TB_window,#TB_overlay,#TB_HideSelect').trigger('unload').unbind().remove(); + $('#TB_window,#TB_overlay,#TB_HideSelect')/*.trigger('unload')*/.unbind().remove(); } ); @@ -454,14 +434,3 @@ return [w, h]; } - -TB.detectMacXFF = function () { - var userAgent = navigator.userAgent.toLowerCase(); - if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox') != -1) { - return true; - } - - return false; -} - -