File tree Expand file tree Collapse file tree 2 files changed +5
-24
lines changed Expand file tree Collapse file tree 2 files changed +5
-24
lines changed Original file line number Diff line number Diff line change @@ -1349,18 +1349,10 @@ const Buffer = Module("buffer", {
1349
1349
return "#" ;
1350
1350
return " " ;
1351
1351
}
1352
- const SessionStore = services . get ( "sessionStore" ) ;
1353
1352
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 {
1364
1356
let i = config . tabbrowser . mTabContainer . getIndexOfItem ( tab ) ;
1365
1357
let info = config . tabbrowser . tabInfo [ i ] ;
1366
1358
return info . browser ?
Original file line number Diff line number Diff line change @@ -417,7 +417,6 @@ const Tabs = Module("tabs", {
417
417
}
418
418
}
419
419
420
- const SessionStore = services . get ( "sessionStore" )
421
420
matches = [ ] ;
422
421
let lowerBuffer = buffer . toLowerCase ( ) ;
423
422
let first = tabs . index ( ) ;
@@ -426,18 +425,8 @@ const Tabs = Module("tabs", {
426
425
let index = ( i + first ) % nbrowsers ;
427
426
let browser = config . tabbrowser . browsers [ index ] ;
428
427
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 ( ) ;
441
430
if ( url == buffer )
442
431
return [ tab ] ;
443
432
You can’t perform that action at this time.
0 commit comments