Skip to content

Commit 522d90f

Browse files
committed
remove browser.__SS_* properties and SessionStore
title: from `tab.label` url: from `browser.contentDocument.location.href` Fixes issue 861 Update issue 859 Now, no more needs to use SessionStore for getting title and url.
1 parent f2cb36d commit 522d90f

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

common/content/buffer.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,18 +1349,10 @@ const Buffer = Module("buffer", {
13491349
return "#";
13501350
return " ";
13511351
}
1352-
const SessionStore = services.get("sessionStore");
13531352
function getURLFromTab (tab) {
1354-
if ("linkedBrowser" in tab) {
1355-
if ("__SS_restoreState" in tab.linkedBrowser) {
1356-
let tabState = JSON.parse(SessionStore.getTabState(tab));
1357-
if (tabState.entries.length)
1358-
return tabState.entries.slice(-1)[0].url;
1359-
else
1360-
return tabState.userTypedValue || 'about:blank';
1361-
} else
1362-
return tab.linkedBrowser.contentDocument.location.href;
1363-
} else {
1353+
if ("linkedBrowser" in tab)
1354+
return tab.linkedBrowser.contentDocument.location.href;
1355+
else {
13641356
let i = config.tabbrowser.mTabContainer.getIndexOfItem(tab);
13651357
let info = config.tabbrowser.tabInfo[i];
13661358
return info.browser ?

common/content/tabs.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ const Tabs = Module("tabs", {
417417
}
418418
}
419419

420-
const SessionStore = services.get("sessionStore")
421420
matches = [];
422421
let lowerBuffer = buffer.toLowerCase();
423422
let first = tabs.index();
@@ -426,18 +425,8 @@ const Tabs = Module("tabs", {
426425
let index = (i + first) % nbrowsers;
427426
let browser = config.tabbrowser.browsers[index];
428427
let tab = tabs.getTab(index);
429-
let url, title;
430-
if ("__SS_restoreState" in browser) {
431-
let tabState = JSON.parse(SessionStore.getTabState(tab));
432-
let entry = tabState.entries[tabState.index - 1];
433-
url = entry.url;
434-
title = entry.title || url;
435-
}
436-
else {
437-
url = browser.contentDocument.location.href;
438-
title = browser.contentDocument.title;
439-
}
440-
title = title.toLowerCase();
428+
let url = borwser.contentDocument.location.href;
429+
let title = tab.label.toLowerCase();
441430
if (url == buffer)
442431
return [tab];
443432

0 commit comments

Comments
 (0)