Skip to content

Fix focusSearchField(), fixes #374. Removes gear icon (and compose when too small), fixes #264, #313, #387, #402 #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hampustagerud wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix focusSearchField(), fixes #374. Removes gear icon (and compose when too small), fixes #264, #313, #387, #402 #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
98a1f81
Fixes #346
hampustagerud Dec 29, 2016
06cda85
Merge remote-tracking branch 'rsms/master'
hampustagerud Apr 9, 2017
8a9beb1
Fixes focusSearchField()
hampustagerud Apr 9, 2017
8d28bfd
Update AppDelegate.mm
hampustagerud Apr 14, 2017
9a15514
Merge remote-tracking branch 'rsms/master'
hampustagerud Aug 10, 2017
76d5473
Merge remote-tracking branch 'origin/master'
hampustagerud Aug 10, 2017
c8c149b
Disable overscroll in webview
hampustagerud Aug 10, 2017
0f01ab4
CSS based solution for hiding gear icon
hampustagerud Aug 10, 2017
e60a95e
Fixes compose icon being shown beneath window controls
hampustagerud Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Messenger/AppDelegate.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,10 @@ - (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame {
"s.backgroundImage='url(%@)';",
kErrorPNGDataURL]];
}

NSScrollView *mainScrollView = webView.mainFrame.frameView.documentView.enclosingScrollView;
[mainScrollView setVerticalScrollElasticity:NSScrollElasticityNone];
[mainScrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
}

-(void)webView:(WebView *)webView didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
Expand Down
7 changes: 3 additions & 4 deletions website/app/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@
var mainMenuButton = header.querySelector('div:first-child .uiPopover a[role="button"]')
if (M._lastMainMenuButton !== mainMenuButton) {
M._lastMainMenuButton = mainMenuButton
if (mainMenuButton) {
mainMenuButton.style.visibility = 'hidden'
}
}
return mainMenuButton
},
Expand Down Expand Up @@ -290,7 +287,7 @@
},

focusSearchField: function() {
document.querySelector('input[aria-autocomplete="list"]').focus();
document.querySelector('input[spellcheck="false"]').focus();
},

focusComposer: function() {
Expand Down Expand Up @@ -396,6 +393,8 @@
var css = document.createElement('style');
css.type = 'text/css';
var style = 'body { overflow: hidden; }'
style += 'div[role="banner"] a[role="button"]:first-child { visibility: hidden; }'
style += '@media(max-width: 700px) { div[role="banner"] a[href="/new"] { visibility: hidden; } }'
css.appendChild(document.createTextNode(style));
document.getElementsByTagName('head')[0].appendChild(css);
}
Expand Down