open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify getActiveTabRealURL: main frame is always 0

Browse Source
This commit is contained in:
tophf 2015-07-24 14:36:43 +03:00
parent 7d25709a7d
commit a3401b0572
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
messaging.js
View File

@ -76,14 +76,9 @@ function getActiveTabRealURL(callback) {
function getTabRealURL(tab, callback) { function getTabRealURL(tab, callback) {
if (tab.url != "chrome://newtab/") { if (tab.url != "chrome://newtab/") {
callback(tab.url); callback(tab.url);
return; } else {
} chrome.webNavigation.getFrame({tabId: tab.id, frameId: 0, processId: -1}, function(frame) {
chrome.webNavigation.getAllFrames({tabId: tab.id}, function(frames) { frame && callback(frame.url);
frames.some(function(frame) {
if (frame.parentFrameId == -1) { // parentless frame is the main frame
callback(frame.url);
return true;
}
});
}); });
}
} }