summaryrefslogtreecommitdiffstats
path: root/dom/html
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-01-09 13:07:56 +0000
committerGitHub <noreply@github.com>2020-01-09 13:07:56 +0000
commit29bf28ca34cb3061d2a6c38f60b01f2d7ca1e1e2 (patch)
tree3542eb0e53d20ba44a96a0b6a801d8a77ea8fb8f /dom/html
parentd79cc5fb49131cba4ed1aa86bb13de468a718565 (diff)
parent52bda2a828364a9a2b3847a005587fa0ea952b30 (diff)
downloadUXP-29bf28ca34cb3061d2a6c38f60b01f2d7ca1e1e2.tar
UXP-29bf28ca34cb3061d2a6c38f60b01f2d7ca1e1e2.tar.gz
UXP-29bf28ca34cb3061d2a6c38f60b01f2d7ca1e1e2.tar.lz
UXP-29bf28ca34cb3061d2a6c38f60b01f2d7ca1e1e2.tar.xz
UXP-29bf28ca34cb3061d2a6c38f60b01f2d7ca1e1e2.zip
Merge pull request #1347 from g4jc/html5_dialog
Implement HMTL5 <dialog>
Diffstat (limited to 'dom/html')
-rw-r--r--dom/html/HTMLDialogElement.cpp95
-rw-r--r--dom/html/HTMLDialogElement.h61
-rw-r--r--dom/html/moz.build2
-rw-r--r--dom/html/nsGenericHTMLElement.h1
4 files changed, 159 insertions, 0 deletions
diff --git a/dom/html/HTMLDialogElement.cpp b/dom/html/HTMLDialogElement.cpp
new file mode 100644
index 000000000..48666628e
--- /dev/null
+++ b/dom/html/HTMLDialogElement.cpp
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/HTMLDialogElement.h"
+#include "mozilla/dom/HTMLDialogElementBinding.h"
+#include "mozilla/dom/HTMLUnknownElement.h"
+#include "mozilla/Preferences.h"
+
+// Expand NS_IMPL_NS_NEW_HTML_ELEMENT(Dialog) with pref check
+nsGenericHTMLElement*
+NS_NewHTMLDialogElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
+ mozilla::dom::FromParser aFromParser)
+{
+ if (!mozilla::dom::HTMLDialogElement::IsDialogEnabled()) {
+ return new mozilla::dom::HTMLUnknownElement(aNodeInfo);
+ }
+
+ return new mozilla::dom::HTMLDialogElement(aNodeInfo);
+}
+
+namespace mozilla {
+namespace dom {
+
+HTMLDialogElement::~HTMLDialogElement()
+{
+}
+
+NS_IMPL_ELEMENT_CLONE(HTMLDialogElement)
+
+bool
+HTMLDialogElement::IsDialogEnabled()
+{
+ static bool isDialogEnabled = false;
+ static bool added = false;
+
+ if (!added) {
+ Preferences::AddBoolVarCache(&isDialogEnabled,
+ "dom.dialog_element.enabled");
+ added = true;
+ }
+
+ return isDialogEnabled;
+}
+
+void
+HTMLDialogElement::Close(const mozilla::dom::Optional<nsAString>& aReturnValue)
+{
+ if (!Open()) {
+ return;
+ }
+ if (aReturnValue.WasPassed()) {
+ SetReturnValue(aReturnValue.Value());
+ }
+ ErrorResult ignored;
+ SetOpen(false, ignored);
+ ignored.SuppressException();
+ RefPtr<AsyncEventDispatcher> eventDispatcher =
+ new AsyncEventDispatcher(this, NS_LITERAL_STRING("close"), false);
+ eventDispatcher->PostDOMEvent();
+}
+
+void
+HTMLDialogElement::Show()
+{
+ if (Open()) {
+ return;
+ }
+ ErrorResult ignored;
+ SetOpen(true, ignored);
+ ignored.SuppressException();
+}
+
+void
+HTMLDialogElement::ShowModal(ErrorResult& aError)
+{
+ if (!IsInComposedDoc() || Open()) {
+ aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+ return;
+ }
+
+ SetOpen(true, aError);
+ aError.SuppressException();
+}
+
+JSObject*
+HTMLDialogElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+{
+ return HTMLDialogElementBinding::Wrap(aCx, this, aGivenProto);
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/html/HTMLDialogElement.h b/dom/html/HTMLDialogElement.h
new file mode 100644
index 000000000..efa319f3c
--- /dev/null
+++ b/dom/html/HTMLDialogElement.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef HTMLDialogElement_h
+#define HTMLDialogElement_h
+
+#include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/Attributes.h"
+#include "nsGenericHTMLElement.h"
+#include "nsGkAtoms.h"
+
+namespace mozilla {
+namespace dom {
+
+class HTMLDialogElement final : public nsGenericHTMLElement
+{
+public:
+ explicit HTMLDialogElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : nsGenericHTMLElement(aNodeInfo)
+ {
+ }
+
+ NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLDialogElement, dialog)
+
+ virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const override;
+
+ static bool IsDialogEnabled();
+
+ bool Open() const { return GetBoolAttr(nsGkAtoms::open); }
+ void SetOpen(bool aOpen, ErrorResult& aError)
+ {
+ SetHTMLBoolAttr(nsGkAtoms::open, aOpen, aError);
+ }
+
+ void GetReturnValue(nsAString& aReturnValue)
+ {
+ aReturnValue = mReturnValue;
+ }
+ void SetReturnValue(const nsAString& aReturnValue)
+ {
+ mReturnValue = aReturnValue;
+ }
+
+ void Close(const mozilla::dom::Optional<nsAString>& aReturnValue);
+ void Show();
+ void ShowModal(ErrorResult& aError);
+
+ nsString mReturnValue;
+
+protected:
+ virtual ~HTMLDialogElement();
+ JSObject* WrapNode(JSContext* aCx,
+ JS::Handle<JSObject*> aGivenProto) override;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff --git a/dom/html/moz.build b/dom/html/moz.build
index c9879d1e6..c86c169b5 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -56,6 +56,7 @@ EXPORTS.mozilla.dom += [
'HTMLDataElement.h',
'HTMLDataListElement.h',
'HTMLDetailsElement.h',
+ 'HTMLDialogElement.h',
'HTMLDivElement.h',
'HTMLFieldSetElement.h',
'HTMLFontElement.h',
@@ -134,6 +135,7 @@ UNIFIED_SOURCES += [
'HTMLDataElement.cpp',
'HTMLDataListElement.cpp',
'HTMLDetailsElement.cpp',
+ 'HTMLDialogElement.cpp',
'HTMLDivElement.cpp',
'HTMLElement.cpp',
'HTMLFieldSetElement.cpp',
diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
index 24a7a3652..72039f266 100644
--- a/dom/html/nsGenericHTMLElement.h
+++ b/dom/html/nsGenericHTMLElement.h
@@ -1654,6 +1654,7 @@ NS_DECLARE_NS_NEW_HTML_ELEMENT(Mod)
NS_DECLARE_NS_NEW_HTML_ELEMENT(Data)
NS_DECLARE_NS_NEW_HTML_ELEMENT(DataList)
NS_DECLARE_NS_NEW_HTML_ELEMENT(Details)
+NS_DECLARE_NS_NEW_HTML_ELEMENT(Dialog)
NS_DECLARE_NS_NEW_HTML_ELEMENT(Div)
NS_DECLARE_NS_NEW_HTML_ELEMENT(FieldSet)
NS_DECLARE_NS_NEW_HTML_ELEMENT(Font)