Skip to content

Add Utils.getMainDocumentElement for Firefox driver #21

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

Closed
paroga wants to merge 1 commit into from
Closed

Add Utils.getMainDocumentElement for Firefox driver #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions javascript/firefox-driver/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Utils.getActiveElement = function(doc) {

// Default to the body
if (!element) {
element = doc.body;
element = Utils.getMainDocumentElement(doc);
}

return element;
Expand Down Expand Up @@ -1176,8 +1176,8 @@ Utils.getPageUnloadedIndicator = function(element) {
var unloadFunction = function() { toReturn.wasUnloaded = true };
toReturn.callback = unloadFunction;

element.ownerDocument.body.addEventListener('unload',
unloadFunction, false);
var mainDocumentElement = Utils.getMainDocumentElement(element.ownerDocument);
mainDocumentElement.addEventListener('unload', unloadFunction, false);

// This is a Firefox specific event - See:
// https://developer.mozilla.org/En/Using_Firefox_1.5_caching
Expand All @@ -1191,8 +1191,9 @@ Utils.removePageUnloadEventListener = function(element, pageUnloadData) {
if (pageUnloadData.callback) {
// Remove event listeners...
if (element.ownerDocument) {
if (element.ownerDocument.body) {
element.ownerDocument.body.removeEventListener('unload',
var mainDocumentElement = Utils.getMainDocumentElement(element.ownerDocument);
if (mainDocumentElement) {
mainDocumentElement.removeEventListener('unload',
pageUnloadData.callback, false);
}
if (element.ownerDocument.defaultView) {
Expand Down Expand Up @@ -1227,3 +1228,13 @@ Utils.convertNSIArrayToNative = function(arrayToConvert) {

return returnArray;
};

Utils.isSVG = function(doc) {
return doc.documentElement && doc.documentElement.nodeName == 'svg';
};

Utils.getMainDocumentElement = function(doc) {
if (Utils.isSVG(doc))
return doc.documentElement;
return doc.body;
};
2 changes: 1 addition & 1 deletion javascript/firefox-driver/js/wrappedElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ WebElement.getElementLocationOnceScrolledIntoView = function(
respond.session.getDocument());

var theDoc = element.ownerDocument;
theDoc.body.focus();
Utils.getMainDocumentElement(theDoc).focus();
var elementLocation = Utils.getLocationOnceScrolledIntoView(element);

respond.value = {
Expand Down