Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle exception when document.domain is set #382

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle exception when document.domain is set #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f489a52
fix for document.domain
RobinQu Feb 17, 2014
39509c4
update test script
RobinQu Feb 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/dojo.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -903,10 +904,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -940,8 +952,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/extjs.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -873,10 +874,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -910,8 +922,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/jquery.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -859,10 +860,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -896,8 +908,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/mootools.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -866,10 +867,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -903,8 +915,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/native.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -903,10 +904,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -940,8 +952,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/right.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -860,10 +861,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -897,8 +909,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
29 changes: 23 additions & 6 deletions scripts/bundled-uncompressed/html4+html5/zepto.history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,8 @@ if (typeof JSON !== 'object') {
var lastDocumentHash = '',
iframeId, iframe,
lastIframeHash, checkerRunning,
startedWithHash = Boolean(History.getHash());
startedWithHash = Boolean(History.getHash()),
domainSet = false;

// Handle depending on the browser
if ( History.isInternetExplorer() ) {
Expand All @@ -856,10 +857,21 @@ if (typeof JSON !== 'object') {

// Append iFrame
document.body.appendChild(iframe);


try {
iframe.contentWindow.document;
} catch(e) {
domainSet = true;
}
// Create initial history entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();

}

// Define some variables that will help in our checker function
lastIframeHash = '';
Expand Down Expand Up @@ -893,8 +905,13 @@ if (typeof JSON !== 'object') {
lastIframeHash = iframeHash = documentHash;

// Create History Entry
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
if(domainSet) {
iframe.setAttribute('src', 'javascript:void((function(){document.open();document.domain="'+ document.domain + '";document.close()})())');

} else {
iframe.contentWindow.document.open();
iframe.contentWindow.document.close();
}

// Update the iframe's hash
iframe.contentWindow.document.location.hash = History.escapeHash(documentHash);
Expand Down
2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/dojo.history.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/extjs.history.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/jquery.history.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/mootools.history.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/native.history.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/right.history.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/bundled/html4+html5/zepto.history.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading