From b385a44f6f9e61af86fcbd028e6b1c10a43793a4 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 1 Dec 2023 06:57:26 -0500 Subject: [PATCH] Browser: Remove the standalone JavaScript console --- .../Applications/Browser/BrowserWindow.cpp | 9 --- Userland/Applications/Browser/CMakeLists.txt | 1 - .../Applications/Browser/ConsoleWidget.cpp | 72 ------------------- Userland/Applications/Browser/ConsoleWidget.h | 37 ---------- Userland/Applications/Browser/Tab.cpp | 21 ------ Userland/Applications/Browser/Tab.h | 5 +- 6 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 Userland/Applications/Browser/ConsoleWidget.cpp delete mode 100644 Userland/Applications/Browser/ConsoleWidget.h diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index cf5f873562..2c3cdd9901 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -10,7 +10,6 @@ #include "BrowserWindow.h" #include "BookmarksBarWidget.h" #include "Browser.h" -#include "ConsoleWidget.h" #include "InspectorWidget.h" #include "Tab.h" #include @@ -256,14 +255,6 @@ void BrowserWindow::build_menus() inspect_menu->add_action(*m_view_source_action); inspect_menu->add_action(*m_inspect_dom_tree_action); - auto js_console_action = GUI::Action::create( - "Open &JS Console", { Mod_Ctrl, Key_I }, g_icon_bag.filetype_javascript, [this](auto&) { - active_tab().show_console_window(); - }, - this); - js_console_action->set_status_tip("Open JavaScript console for this page"_string); - inspect_menu->add_action(js_console_action); - auto storage_window_action = GUI::Action::create( "Open S&torage Inspector", g_icon_bag.cookie, [this](auto&) { active_tab().show_storage_inspector(); diff --git a/Userland/Applications/Browser/CMakeLists.txt b/Userland/Applications/Browser/CMakeLists.txt index 6f28e4401c..6409346b0f 100644 --- a/Userland/Applications/Browser/CMakeLists.txt +++ b/Userland/Applications/Browser/CMakeLists.txt @@ -14,7 +14,6 @@ stringify_gml(Tab.gml TabGML.h tab_gml) set(SOURCES BookmarksBarWidget.cpp BrowserWindow.cpp - ConsoleWidget.cpp CookiesModel.cpp DownloadWidget.cpp History/HistoryModel.cpp diff --git a/Userland/Applications/Browser/ConsoleWidget.cpp b/Userland/Applications/Browser/ConsoleWidget.cpp deleted file mode 100644 index 192950cbbf..0000000000 --- a/Userland/Applications/Browser/ConsoleWidget.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2020, Hunter Salyer - * Copyright (c) 2021, Andreas Kling - * Copyright (c) 2021, Sam Atkins - * Copyright (c) 2022, the SerenityOS developers. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include "ConsoleWidget.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Browser { - -ConsoleWidget::ConsoleWidget(WebView::OutOfProcessWebView& content_view) -{ - set_layout(); - set_fill_with_background_color(true); - - m_output_view = add(); - m_console_client = make(content_view, *m_output_view); - - auto& bottom_container = add(); - bottom_container.set_layout(); - bottom_container.set_fixed_height(22); - - m_input = bottom_container.add(); - m_input->set_syntax_highlighter(make()); - // FIXME: Syntax Highlighting breaks the cursor's position on non fixed-width fonts. - m_input->set_font(Gfx::FontDatabase::default_fixed_width_font()); - m_input->set_history_enabled(true); - - m_input->on_return_pressed = [this] { - auto js_source = m_input->text(); - - if (js_source.is_whitespace()) - return; - - m_input->add_current_text_to_history(); - m_input->clear(); - - m_console_client->execute(MUST(String::from_deprecated_string(js_source))); - }; - - set_focus_proxy(m_input); - - auto& clear_button = bottom_container.add(); - clear_button.set_fixed_size(22, 22); - clear_button.set_icon(g_icon_bag.delete_icon); - clear_button.set_tooltip("Clear the console output"_string); - clear_button.on_click = [this](auto) { - m_console_client->clear(); - }; -} - -ConsoleWidget::~ConsoleWidget() = default; - -void ConsoleWidget::reset() -{ - m_console_client->reset(); -} - -} diff --git a/Userland/Applications/Browser/ConsoleWidget.h b/Userland/Applications/Browser/ConsoleWidget.h deleted file mode 100644 index 08a5646206..0000000000 --- a/Userland/Applications/Browser/ConsoleWidget.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2020, Hunter Salyer - * Copyright (c) 2021, Andreas Kling - * Copyright (c) 2021, Sam Atkins - * Copyright (c) 2022, the SerenityOS developers. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include - -namespace Browser { - -class ConsoleWidget final : public GUI::Widget { - C_OBJECT(ConsoleWidget) -public: - virtual ~ConsoleWidget(); - - void reset(); - -private: - explicit ConsoleWidget(WebView::OutOfProcessWebView& content_view); - - void request_console_messages(); - void clear_output(); - - OwnPtr m_console_client; - - RefPtr m_input; - RefPtr m_output_view; -}; - -} diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp index 5f896c0e3f..2d667d9ed9 100644 --- a/Userland/Applications/Browser/Tab.cpp +++ b/Userland/Applications/Browser/Tab.cpp @@ -13,7 +13,6 @@ #include "BookmarksBarWidget.h" #include "Browser.h" #include "BrowserWindow.h" -#include "ConsoleWidget.h" #include "DownloadWidget.h" #include "History/HistoryWidget.h" #include "InspectorWidget.h" @@ -233,9 +232,6 @@ Tab::Tab(BrowserWindow& window) if (m_dom_inspector_widget) m_dom_inspector_widget->reset(); - - if (m_console_widget) - m_console_widget->reset(); }; view().on_load_finish = [this](auto&) { @@ -895,26 +891,9 @@ void Tab::close_sub_widgets() } }; close_widget_window(m_dom_inspector_widget); - close_widget_window(m_console_widget); close_widget_window(m_storage_widget); } -void Tab::show_console_window() -{ - if (!m_console_widget) { - auto console_window = GUI::Window::construct(&window()); - console_window->resize(500, 300); - console_window->set_title("JS Console"); - console_window->set_icon(g_icon_bag.filetype_javascript); - - m_console_widget = console_window->set_main_widget(view()); - } - - auto* window = m_console_widget->window(); - window->show(); - window->move_to_front(); -} - void Tab::show_storage_inspector() { if (!m_storage_widget) { diff --git a/Userland/Applications/Browser/Tab.h b/Userland/Applications/Browser/Tab.h index 50d0ad51da..c07d99a087 100644 --- a/Userland/Applications/Browser/Tab.h +++ b/Userland/Applications/Browser/Tab.h @@ -25,7 +25,6 @@ namespace Browser { class BrowserWindow; class InspectorWidget; -class ConsoleWidget; class HistoryWidget; class StorageWidget; class URLBox; @@ -89,7 +88,6 @@ public: }; void show_inspector_window(InspectorTarget); - void show_console_window(); void show_storage_inspector(); void show_history_inspector(); @@ -125,7 +123,6 @@ private: RefPtr m_reset_zoom_button; RefPtr m_bookmark_button; RefPtr m_dom_inspector_widget; - RefPtr m_console_widget; RefPtr m_storage_widget; RefPtr m_history_widget; RefPtr m_statusbar; @@ -158,7 +155,7 @@ private: RefPtr m_go_forward_context_menu; DeprecatedString m_title; - RefPtr m_icon; + RefPtr m_icon; Optional m_navigating_url;