mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Browser: Append .com when pressing CTRL+Enter in the URL text editor

Browse source 
This is the behavior in Firefox / Chrome.
This commit is contained in:
Rok Povsic 2022-03-19 12:10:38 +01:00 • committed by Andreas Kling
parent 7da0d94d03
commit 5bb5967259
2 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Userland/Applications/Browser/Tab.cpp
View file

@ -151,13 +151,15 @@ Tab::Tab(BrowserWindow& window)
m_location_box->set_placeholder("Address");
m_location_box->on_return_pressed = [this] {
if (m_location_box->text().starts_with('?') && g_search_engine.is_empty()) {
GUI::MessageBox::show(&this->window(), "Select a search engine in the Settings menu before searching.", "No search engine selected", GUI::MessageBox::Type::Information);
return;
}
auto url = url_from_location_bar();
if (url.has_value())
load(url.release_value());
};
auto url = url_from_user_input(m_location_box->text());
load(url);
m_location_box->on_ctrl_return_pressed = [this] {
auto url = url_from_location_bar(MayAppendTLD::Yes);
if (url.has_value())
load(url.release_value());
};
m_location_box->add_custom_context_menu_action(GUI::Action::create("Paste && Go", [this](auto&) {
@ -393,6 +395,29 @@ Tab::Tab(BrowserWindow& window)
};
}
Optional<URL> Tab::url_from_location_bar(MayAppendTLD may_append_tld)
{
if (m_location_box->text().starts_with('?') && g_search_engine.is_empty()) {
GUI::MessageBox::show(&this->window(), "Select a search engine in the Settings menu before searching.", "No search engine selected", GUI::MessageBox::Type::Information);
return {};
}
String text = m_location_box->text();
StringBuilder builder;
builder.append(text);
if (may_append_tld == MayAppendTLD::Yes) {
// FIXME: Expand the list of top level domains.
if (!(text.ends_with(".com") || text.ends_with(".net") || text.ends_with(".org"))) {
builder.append(".com");
}
}
String final_text = builder.to_string();
auto url = url_from_user_input(final_text);
return url;
}
void Tab::load(const URL& url, LoadType load_type)
{
m_is_history_navigation = (load_type == LoadType::HistoryNavigation);

7
Userland/Applications/Browser/Tab.h
View file

@ -94,6 +94,13 @@ private:
void view_source(const URL& url, const String& source);
void update_status(Optional<String> text_override = {}, i32 count_waiting = 0);
enum class MayAppendTLD {
No,
Yes
};
Optional<URL> url_from_location_bar(MayAppendTLD = MayAppendTLD::No);
History m_history;
RefPtr<Web::OutOfProcessWebView> m_web_content_view;