gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-01 08:55:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix :buffer matching for lazily loaded background tabs.

Browse Source
This commit is contained in:
Kris Maglione
2010-09-27 22:22:54 -04:00
parent 7f04597352
commit 886af16f16
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/content/tabs.js
View File

@@ -462,19 +462,15 @@ const Tabs = Module("tabs", {
matches = []; matches = [];
let lowerBuffer = buffer.toLowerCase(); let lowerBuffer = buffer.toLowerCase();
let first = tabs.index() + (reverse ? 0 : 1); let first = tabs.index() + (reverse ? 0 : 1);
let nbrowsers = config.tabbrowser.browsers.length; let allTabs = tabs.allTabs;
for (let [i, ] in tabs.browsers) { for (let [i, ] in Iterator(tabs.allTabs)) {
let index = (i + first) % nbrowsers; let tab = allTabs[(i + first) % allTabs.length];
let browser = config.tabbrowser.getBrowserAtIndex(index); let url = tab.linkedBrowser.contentDocument.location.href;
let url = browser.contentDocument.location.href; if (url == buffer)
let title = browser.contentDocument.title.toLowerCase(); return tabs.select(index, false);
if (url == buffer) {
tabs.select(index, false);
return;
}
if (url.indexOf(buffer) >= 0 || title.indexOf(lowerBuffer) >= 0) if (url.indexOf(buffer) >= 0 || tab.label.toLowerCase().indexOf(lowerBuffer) >= 0)
matches.push(browser); matches.push(tab);
} }
if (matches.length == 0) if (matches.length == 0)
@@ -485,9 +481,7 @@ const Tabs = Module("tabs", {
let index = (count - 1) % matches.length; let index = (count - 1) % matches.length;
if (reverse) if (reverse)
index = matches.length - count; index = matches.length - count;
tabs.select(matches[index], false);
index = Array.indexOf(config.tabbrowser.browsers, matches[index]);
tabs.select(index, false);
} }
}, },