mirror of
https://github.com/internetarchive/brozzler.git
synced 2025-08-09 06:52:46 -04:00
Merge branch 'ARI-5689' into qa
This commit is contained in:
commit
1fffaa9eee
2 changed files with 13 additions and 1 deletions
|
@ -452,7 +452,7 @@ class Browser:
|
||||||
extra_headers=extra_headers,
|
extra_headers=extra_headers,
|
||||||
user_agent=user_agent)
|
user_agent=user_agent)
|
||||||
self.navigate_to_page(page_url, timeout=page_timeout)
|
self.navigate_to_page(page_url, timeout=page_timeout)
|
||||||
if password:
|
if password and not 'facebook.com/groups' in page_url:
|
||||||
self.try_login(username, password, timeout=page_timeout)
|
self.try_login(username, password, timeout=page_timeout)
|
||||||
# if login redirected us, return to page_url
|
# if login redirected us, return to page_url
|
||||||
if page_url != self.url().split('#')[0]:
|
if page_url != self.url().split('#')[0]:
|
||||||
|
|
|
@ -46,6 +46,18 @@ var umbraState = {'idleSince':null,'expectingSomething':null,'bottomReachedScrol
|
||||||
|
|
||||||
var umbraIntervalFunc = function() {
|
var umbraIntervalFunc = function() {
|
||||||
|
|
||||||
|
// for facebook groups, switch to Discussion tab url
|
||||||
|
fbURL = window.location.href;
|
||||||
|
if (fbURL.indexOf("/groups/") !== -1 && fbURL.indexOf("?ref=direct") === -1) {
|
||||||
|
navlinks = document.querySelectorAll('a._2yau');
|
||||||
|
navlinks[1].click(); // click current Discussion link
|
||||||
|
return;
|
||||||
|
//groupDiscussionURL = fbURL.match("https://www.facebook.com/groups/[^/]+")[0] + "/?ref=direct";
|
||||||
|
//if (groupDiscussionURL) {
|
||||||
|
// window.location.href = groupDiscussionURL;
|
||||||
|
// return;
|
||||||
|
//}
|
||||||
|
}
|
||||||
var thingsToScroll = document.querySelectorAll(UMBRA_THINGS_TO_SCROLL_SELECTOR);
|
var thingsToScroll = document.querySelectorAll(UMBRA_THINGS_TO_SCROLL_SELECTOR);
|
||||||
var everythingScrolled = true;
|
var everythingScrolled = true;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue