diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
| commit | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (patch) | |
| tree | 38b8570647124df06c637d4b923f6010211ef328 /web/js/fancybox/jquery.fancybox-1.3.4.js | |
| parent | 40b3a51d33caefa8f5fb97ce9be18ef936c7e260 (diff) | |
| parent | 131ff6e9bf3626d6a8fff6ae54669d250148a63a (diff) | |
Merge remote branch 'origin/master' into fmb-read-only
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
templates/web/fixmystreet/alert/index.html
templates/web/fixmystreet/around/display_location.html
web/cobrands/fixmystreet/_layout.scss
web/js/map-OpenLayers.js
Diffstat (limited to 'web/js/fancybox/jquery.fancybox-1.3.4.js')
| -rw-r--r-- | web/js/fancybox/jquery.fancybox-1.3.4.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/js/fancybox/jquery.fancybox-1.3.4.js b/web/js/fancybox/jquery.fancybox-1.3.4.js index be7727537..728aa6a51 100644 --- a/web/js/fancybox/jquery.fancybox-1.3.4.js +++ b/web/js/fancybox/jquery.fancybox-1.3.4.js @@ -943,7 +943,7 @@ $(window).unbind("resize.fb scroll.fb");
$(document).unbind('keydown.fb');
- content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank');
+ content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? '/js/fancybox/blank.gif' : 'about:blank');
if (currentOpts.titlePosition !== 'inside') {
title.empty();
@@ -1090,7 +1090,7 @@ loading.addClass('fancybox-ie6');
wrap.addClass('fancybox-ie6');
- $('<iframe id="fancybox-hide-sel-frame" src="' + (/^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank' ) + '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(outer);
+ $('<iframe id="fancybox-hide-sel-frame" src="' + (/^https/i.test(window.location.href || '') ? '/js/fancybox/blank.gif' : 'about:blank' ) + '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(outer);
}
};
@@ -1153,4 +1153,4 @@ $.fancybox.init();
});
-})(jQuery);
\ No newline at end of file +})(jQuery);
|