CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-02 02:14:52 +12:00
Code Issues Releases Wiki Activity

fix uncaught exception

Browse source
This commit is contained in:
gorhill 2016-11-15 10:05:05 -05:00
parent e68d9bd76e
commit 4ccb9bd0d4
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/js/contentscript-end.js
View file

@ -155,7 +155,7 @@ var collapser = (function() {
var collapse = response.collapse;
var placeholders = response.placeholders;
var i = requests.length;
var request, entry, target, tagName, docurl;
var request, entry, target, tagName, docurl, replaced;
while ( i-- ) {
request = requests[i];
if ( pendingRequests.hasOwnProperty(request.id) === false ) {
@ -183,11 +183,17 @@ var collapser = (function() {
// Special case: iframe
if ( tagName === 'iframe' ) {
docurl = 'data:text/html,' + encodeURIComponent(placeholders.iframe.replace(reURLplaceholder, request.url));
replaced = false;
// Using contentWindow.location prevent tainting browser
// history -- i.e. breaking back button (seen on Chromium).
if ( target.contentWindow ) {
target.contentWindow.location.replace(docurl);
} else {
try {
target.contentWindow.location.replace(docurl);
replaced = true;
} catch(ex) {
}
}
if ( !replaced ) {
target.setAttribute('src', docurl);
}
continue;