RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 14:07:42 +00:00
Code Issues Activity Actions

LibWeb: Move onfoo attribute handling to EventTarget

Browse source 
This logic was kept in the GlobalEventHandlers mixing for sharing
between Document and HTMLElement, but there are other interfaces who
need to support `onfoo` attribute event listeners as well.
This commit is contained in:
Andreas Kling 2021-09-19 01:38:14 +02:00
parent ae59d8a728
commit 824be02cb0
4 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Userland/Libraries/LibWeb/DOM/EventTarget.cpp
View file

@ -1,13 +1,18 @@
/* /*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/StringBuilder.h>
#include <LibJS/Interpreter.h>
#include <LibJS/Parser.h>
#include <LibJS/Runtime/OrdinaryFunctionObject.h>
#include <LibWeb/Bindings/ScriptExecutionContext.h> #include <LibWeb/Bindings/ScriptExecutionContext.h>
#include <LibWeb/DOM/Event.h> #include <LibWeb/DOM/Event.h>
#include <LibWeb/DOM/EventListener.h> #include <LibWeb/DOM/EventListener.h>
#include <LibWeb/DOM/EventTarget.h> #include <LibWeb/DOM/EventTarget.h>
#include <LibWeb/HTML/EventHandler.h>
namespace Web::DOM { namespace Web::DOM {
@ -68,4 +73,42 @@ ExceptionOr<bool> EventTarget::dispatch_event_binding(NonnullRefPtr<Event> event
return dispatch_event(event); return dispatch_event(event);
} }
HTML::EventHandler EventTarget::event_handler_attribute(FlyString const& name)
{
for (auto& listener : listeners()) {
if (listener.event_name == name && listener.listener->is_attribute()) {
return HTML::EventHandler { JS::make_handle(&listener.listener->function()) };
}
}
return {};
}
void EventTarget::set_event_handler_attribute(FlyString const& name, HTML::EventHandler value)
{
RefPtr<DOM::EventListener> listener;
if (!value.callback.is_null()) {
listener = adopt_ref(*new DOM::EventListener(move(value.callback)));
} else {
StringBuilder builder;
builder.appendff("function {}(event) {{\n{}\n}}", name, value.string);
auto parser = JS::Parser(JS::Lexer(builder.string_view()));
auto program = parser.parse_function_node<JS::FunctionExpression>();
if (parser.has_errors()) {
dbgln("Failed to parse script in event handler attribute '{}'", name);
return;
}
auto* function = JS::OrdinaryFunctionObject::create(script_execution_context()->interpreter().global_object(), name, program->body(), program->parameters(), program->function_length(), nullptr, JS::FunctionKind::Regular, false, false);
VERIFY(function);
listener = adopt_ref(*new DOM::EventListener(JS::make_handle(static_cast<JS::FunctionObject*>(function))));
}
if (listener) {
for (auto& registered_listener : listeners()) {
if (registered_listener.event_name == name && registered_listener.listener->is_attribute()) {
remove_event_listener(name, registered_listener.listener);
break;
}
}
add_event_listener(name, listener.release_nonnull());
}
}
} }

3
Userland/Libraries/LibWeb/DOM/EventTarget.h
View file

@ -53,6 +53,9 @@ public:
Function<void()> legacy_pre_activation_behavior; Function<void()> legacy_pre_activation_behavior;
Function<void()> legacy_cancelled_activation_behavior; Function<void()> legacy_cancelled_activation_behavior;
HTML::EventHandler event_handler_attribute(FlyString const& name);
void set_event_handler_attribute(FlyString const& name, HTML::EventHandler);
protected: protected:
explicit EventTarget(Bindings::ScriptExecutionContext&); explicit EventTarget(Bindings::ScriptExecutionContext&);

59
Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.cpp
View file

@ -17,14 +17,14 @@
namespace Web::HTML { namespace Web::HTML {
#undef __ENUMERATE #undef __ENUMERATE
#define __ENUMERATE(attribute_name, event_name) \ #define __ENUMERATE(attribute_name, event_name) \
void GlobalEventHandlers::set_##attribute_name(HTML::EventHandler value) \ void GlobalEventHandlers::set_##attribute_name(HTML::EventHandler value) \
{ \ { \
set_event_handler_attribute(event_name, move(value)); \ global_event_handlers_to_event_target().set_event_handler_attribute(event_name, move(value)); \
} \ } \
HTML::EventHandler GlobalEventHandlers::attribute_name() \ HTML::EventHandler GlobalEventHandlers::attribute_name() \
{ \ { \
return get_event_handler_attribute(event_name); \ return global_event_handlers_to_event_target().event_handler_attribute(event_name); \
} }
ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE)
#undef __ENUMERATE #undef __ENUMERATE
@ -33,47 +33,4 @@ GlobalEventHandlers::~GlobalEventHandlers()
{ {
} }
void GlobalEventHandlers::set_event_handler_attribute(const FlyString& name, HTML::EventHandler value)
{
auto& self = global_event_handlers_to_event_target();
RefPtr<DOM::EventListener> listener;
if (!value.callback.is_null()) {
listener = adopt_ref(*new DOM::EventListener(move(value.callback)));
} else {
StringBuilder builder;
builder.appendff("function {}(event) {{\n{}\n}}", name, value.string);
auto parser = JS::Parser(JS::Lexer(builder.string_view()));
auto program = parser.parse_function_node<JS::FunctionExpression>();
if (parser.has_errors()) {
dbgln("Failed to parse script in event handler attribute '{}'", name);
return;
}
auto* function = JS::OrdinaryFunctionObject::create(self.script_execution_context()->interpreter().global_object(), name, program->body(), program->parameters(), program->function_length(), nullptr, JS::FunctionKind::Regular, false, false);
VERIFY(function);
listener = adopt_ref(*new DOM::EventListener(JS::make_handle(static_cast<JS::FunctionObject*>(function))));
}
if (listener) {
for (auto& registered_listener : self.listeners()) {
if (registered_listener.event_name == name && registered_listener.listener->is_attribute()) {
self.remove_event_listener(name, registered_listener.listener);
break;
}
}
self.add_event_listener(name, listener.release_nonnull());
}
}
HTML::EventHandler GlobalEventHandlers::get_event_handler_attribute(const FlyString& name)
{
auto& self = global_event_handlers_to_event_target();
for (auto& listener : self.listeners()) {
if (listener.event_name == name && listener.listener->is_attribute()) {
return HTML::EventHandler { JS::make_handle(&listener.listener->function()) };
}
}
return {};
}
} }

3
Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.h
View file

@ -90,9 +90,6 @@ public:
ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE)
#undef __ENUMERATE #undef __ENUMERATE
void set_event_handler_attribute(const FlyString& name, HTML::EventHandler);
HTML::EventHandler get_event_handler_attribute(const FlyString& name);
protected: protected:
virtual DOM::EventTarget& global_event_handlers_to_event_target() = 0; virtual DOM::EventTarget& global_event_handlers_to_event_target() = 0;
}; };