summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-06-07 16:01:04 +0100
committerVincent Sanders <vince@kyllikki.org>2016-06-07 16:01:04 +0100
commit042fcb82b83d19bf08afd3367235ac71a60b3850 (patch)
tree47fe3c15f160b3fac7b0e8ab4f47b495901e0557
parent9754539e2275e33af34b5de9d343b85e8122d871 (diff)
downloadnetsurf-042fcb82b83d19bf08afd3367235ac71a60b3850.tar.gz
netsurf-042fcb82b83d19bf08afd3367235ac71a60b3850.tar.bz2
Move javascript content handler as appropriate for updated source format
-rw-r--r--Docs/Doxyfile4
-rw-r--r--Docs/UnimplementedJavascript.txt1
-rw-r--r--Makefile15
-rw-r--r--content/Makefile3
-rw-r--r--content/handlers/Makefile7
-rw-r--r--content/handlers/javascript/Makefile18
-rw-r--r--content/handlers/javascript/WebIDL/Makefile (renamed from javascript/WebIDL/Makefile)0
-rw-r--r--content/handlers/javascript/WebIDL/console.idl (renamed from javascript/WebIDL/console.idl)0
-rw-r--r--content/handlers/javascript/WebIDL/cssom.idl (renamed from javascript/WebIDL/cssom.idl)0
-rw-r--r--content/handlers/javascript/WebIDL/dom-parsing.idl (renamed from javascript/WebIDL/dom-parsing.idl)0
-rw-r--r--content/handlers/javascript/WebIDL/dom.idl (renamed from javascript/WebIDL/dom.idl)0
-rw-r--r--content/handlers/javascript/WebIDL/html.idl (renamed from javascript/WebIDL/html.idl)0
-rw-r--r--content/handlers/javascript/WebIDL/uievents.idl (renamed from javascript/WebIDL/uievents.idl)0
-rw-r--r--content/handlers/javascript/WebIDL/urlutils.idl (renamed from javascript/WebIDL/urlutils.idl)0
-rw-r--r--content/handlers/javascript/content.c (renamed from javascript/content.c)0
-rw-r--r--content/handlers/javascript/content.h (renamed from javascript/content.h)0
-rw-r--r--content/handlers/javascript/duktape/Console.bnd (renamed from javascript/duktape/Console.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Document.bnd (renamed from javascript/duktape/Document.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Element.bnd (renamed from javascript/duktape/Element.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Event.bnd (renamed from javascript/duktape/Event.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLAnchorElement.bnd (renamed from javascript/duktape/HTMLAnchorElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLAppletElement.bnd (renamed from javascript/duktape/HTMLAppletElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLAreaElement.bnd (renamed from javascript/duktape/HTMLAreaElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLBRElement.bnd (renamed from javascript/duktape/HTMLBRElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLBaseElement.bnd (renamed from javascript/duktape/HTMLBaseElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLBodyElement.bnd (renamed from javascript/duktape/HTMLBodyElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLButtonElement.bnd (renamed from javascript/duktape/HTMLButtonElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLCollection.bnd (renamed from javascript/duktape/HTMLCollection.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLDivElement.bnd (renamed from javascript/duktape/HTMLDivElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLElement.bnd (renamed from javascript/duktape/HTMLElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLFontElement.bnd (renamed from javascript/duktape/HTMLFontElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLFormElement.bnd (renamed from javascript/duktape/HTMLFormElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLFrameElement.bnd (renamed from javascript/duktape/HTMLFrameElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLFrameSetElement.bnd (renamed from javascript/duktape/HTMLFrameSetElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLHRElement.bnd (renamed from javascript/duktape/HTMLHRElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLHTMLElement.bnd (renamed from javascript/duktape/HTMLHTMLElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLHeadingElement.bnd (renamed from javascript/duktape/HTMLHeadingElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLIFrameElement.bnd (renamed from javascript/duktape/HTMLIFrameElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLImageElement.bnd (renamed from javascript/duktape/HTMLImageElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLInputElement.bnd (renamed from javascript/duktape/HTMLInputElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLLIElement.bnd (renamed from javascript/duktape/HTMLLIElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLLabelElement.bnd (renamed from javascript/duktape/HTMLLabelElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLLegendElement.bnd (renamed from javascript/duktape/HTMLLegendElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLLinkElement.bnd (renamed from javascript/duktape/HTMLLinkElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLMapElement.bnd (renamed from javascript/duktape/HTMLMapElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLMarqueeElement.bnd (renamed from javascript/duktape/HTMLMarqueeElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLMenuElement.bnd (renamed from javascript/duktape/HTMLMenuElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLMetaElement.bnd (renamed from javascript/duktape/HTMLMetaElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLOListElement.bnd (renamed from javascript/duktape/HTMLOListElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLObjectElement.bnd (renamed from javascript/duktape/HTMLObjectElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLOptionElement.bnd (renamed from javascript/duktape/HTMLOptionElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLParagraphElement.bnd (renamed from javascript/duktape/HTMLParagraphElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLParamElement.bnd (renamed from javascript/duktape/HTMLParamElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLPreElement.bnd (renamed from javascript/duktape/HTMLPreElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLQuoteElement.bnd (renamed from javascript/duktape/HTMLQuoteElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLScriptElement.bnd (renamed from javascript/duktape/HTMLScriptElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLSelectElement.bnd (renamed from javascript/duktape/HTMLSelectElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLStyleElement.bnd (renamed from javascript/duktape/HTMLStyleElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTableCaptionElement.bnd (renamed from javascript/duktape/HTMLTableCaptionElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTableCellElement.bnd (renamed from javascript/duktape/HTMLTableCellElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTableColElement.bnd (renamed from javascript/duktape/HTMLTableColElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTableElement.bnd (renamed from javascript/duktape/HTMLTableElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTableRowElement.bnd (renamed from javascript/duktape/HTMLTableRowElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTableSectionElement.bnd (renamed from javascript/duktape/HTMLTableSectionElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTextAreaElement.bnd (renamed from javascript/duktape/HTMLTextAreaElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/HTMLTitleElement.bnd (renamed from javascript/duktape/HTMLTitleElement.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Location.bnd (renamed from javascript/duktape/Location.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Makefile (renamed from javascript/duktape/Makefile)12
-rw-r--r--content/handlers/javascript/duktape/Navigator.bnd (renamed from javascript/duktape/Navigator.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Node.bnd (renamed from javascript/duktape/Node.bnd)0
-rw-r--r--content/handlers/javascript/duktape/NodeList.bnd (renamed from javascript/duktape/NodeList.bnd)0
-rw-r--r--content/handlers/javascript/duktape/Window.bnd (renamed from javascript/duktape/Window.bnd)0
-rw-r--r--content/handlers/javascript/duktape/duk_config.h (renamed from javascript/duktape/duk_config.h)0
-rw-r--r--content/handlers/javascript/duktape/duk_custom.h (renamed from javascript/duktape/duk_custom.h)0
-rw-r--r--content/handlers/javascript/duktape/dukky.c (renamed from javascript/duktape/dukky.c)0
-rw-r--r--content/handlers/javascript/duktape/dukky.h (renamed from javascript/duktape/dukky.h)0
-rw-r--r--content/handlers/javascript/duktape/duktape.c (renamed from javascript/duktape/duktape.c)0
-rw-r--r--content/handlers/javascript/duktape/duktape.h (renamed from javascript/duktape/duktape.h)0
-rw-r--r--content/handlers/javascript/duktape/netsurf.bnd (renamed from javascript/duktape/netsurf.bnd)0
-rw-r--r--content/handlers/javascript/fetcher.c (renamed from javascript/fetcher.c)0
-rw-r--r--content/handlers/javascript/fetcher.h (renamed from javascript/fetcher.h)0
-rw-r--r--content/handlers/javascript/js.h (renamed from javascript/js.h)0
-rw-r--r--content/handlers/javascript/none/Makefile (renamed from javascript/none/Makefile)0
-rw-r--r--content/handlers/javascript/none/none.c (renamed from javascript/none/none.c)0
-rw-r--r--javascript/Makefile34
85 files changed, 40 insertions, 54 deletions
diff --git a/Docs/Doxyfile b/Docs/Doxyfile
index 24cc3da77..e2cb5639c 100644
--- a/Docs/Doxyfile
+++ b/Docs/Doxyfile
@@ -679,8 +679,8 @@ INPUT = frontends/amiga \
content/fetchers \
content/handlers/image \
content/handlers/css \
- javascript \
- javascript/jsapi \
+ content/handlers/javascript \
+ content/handlers/javascript/duktape \
utils \
utils/http \
Docs/UnimplementedJavascript.txt
diff --git a/Docs/UnimplementedJavascript.txt b/Docs/UnimplementedJavascript.txt
index cb506993c..2b3a7d95b 100644
--- a/Docs/UnimplementedJavascript.txt
+++ b/Docs/UnimplementedJavascript.txt
@@ -630,7 +630,6 @@ getter HTMLElement::onerror(user);\n
setter HTMLElement::onerror(user);\n
getter HTMLElement::spellcheck(boolean);\n
setter HTMLElement::spellcheck(boolean);\n
-getter HTMLElement::style(user);\n
getter HTMLElement::tabIndex(long);\n
setter HTMLElement::tabIndex(long);\n
getter HTMLElement::translate(boolean);\n
diff --git a/Makefile b/Makefile
index 6b190074e..226bf4f3d 100644
--- a/Makefile
+++ b/Makefile
@@ -596,16 +596,10 @@ include utils/http/Makefile
# Desktop sources
include desktop/Makefile
-# Javascript source
-include javascript/Makefile
-
# S_COMMON are sources common to all builds
-S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER) $(S_UTILS) \
- $(S_HTTP) $(S_DESKTOP) $(S_JAVASCRIPT)
-
+S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_RENDER) $(S_UTILS) $(S_HTTP) \
+ $(S_DESKTOP) $(S_JAVASCRIPT_BINDING)
-# Include directory flags
-IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
# ----------------------------------------------------------------------------
# Message targets
@@ -630,7 +624,7 @@ MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
endef
-# geenrate the message file rules
+# generate the message file rules
$(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \
$(call split_messages,$(LANG))))
@@ -653,6 +647,9 @@ endif
OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.m,%.o,$(patsubst %.s,%.o,$(SOURCES))))))))
+# Include directory flags
+IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
+
$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
$(VQ)echo " LINK: $(EXETARGET)"
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
diff --git a/content/Makefile b/content/Makefile
index 02490618a..b4353ba95 100644
--- a/content/Makefile
+++ b/content/Makefile
@@ -8,10 +8,11 @@ ifeq ($(NETSURF_FS_BACKING_STORE),YES)
S_CONTENT += fs_backing_store.c
endif
-S_CONTENT := $(addprefix content/,$(S_CONTENT))
# Content fetchers sources
include content/fetchers/Makefile
# Content handlers
include content/handlers/Makefile
+
+S_CONTENT := $(addprefix content/,$(S_CONTENT))
diff --git a/content/handlers/Makefile b/content/handlers/Makefile
index e57fc1119..2f2da3aed 100644
--- a/content/handlers/Makefile
+++ b/content/handlers/Makefile
@@ -6,6 +6,11 @@ S_IMAGE := $(addprefix content/handlers/image/,$(S_IMAGE))
# CSS sources
include content/handlers/css/Makefile
-S_CSS := $(addprefix content/handlers/css/,$(S_CSS))
+S_CONTENT += $(addprefix handlers/css/,$(S_CSS))
+
+# Javascript source
+include content/handlers/javascript/Makefile
+
+S_CONTENT += $(addprefix handlers/javascript/,$(S_JAVASCRIPT))
INCLUDE_DIRS += content/handlers
diff --git a/content/handlers/javascript/Makefile b/content/handlers/javascript/Makefile
new file mode 100644
index 000000000..5cd0fc36b
--- /dev/null
+++ b/content/handlers/javascript/Makefile
@@ -0,0 +1,18 @@
+#
+# NetSurf javascript source file inclusion
+#
+# Included by Makefile
+#
+
+S_JAVASCRIPT_BINDING:=
+
+ifeq ($(NETSURF_USE_DUKTAPE),YES)
+# Duktape
+include content/handlers/javascript/duktape/Makefile
+else
+# None
+include content/handlers/javascript/none/Makefile
+endif
+
+# Fetcher for javascript scheme is always required
+S_JAVASCRIPT += fetcher.c
diff --git a/javascript/WebIDL/Makefile b/content/handlers/javascript/WebIDL/Makefile
index 7d901cee1..7d901cee1 100644
--- a/javascript/WebIDL/Makefile
+++ b/content/handlers/javascript/WebIDL/Makefile
diff --git a/javascript/WebIDL/console.idl b/content/handlers/javascript/WebIDL/console.idl
index 5a3d9eb27..5a3d9eb27 100644
--- a/javascript/WebIDL/console.idl
+++ b/content/handlers/javascript/WebIDL/console.idl
diff --git a/javascript/WebIDL/cssom.idl b/content/handlers/javascript/WebIDL/cssom.idl
index 95c97e42a..95c97e42a 100644
--- a/javascript/WebIDL/cssom.idl
+++ b/content/handlers/javascript/WebIDL/cssom.idl
diff --git a/javascript/WebIDL/dom-parsing.idl b/content/handlers/javascript/WebIDL/dom-parsing.idl
index d2581328e..d2581328e 100644
--- a/javascript/WebIDL/dom-parsing.idl
+++ b/content/handlers/javascript/WebIDL/dom-parsing.idl
diff --git a/javascript/WebIDL/dom.idl b/content/handlers/javascript/WebIDL/dom.idl
index 1c9e75bd8..1c9e75bd8 100644
--- a/javascript/WebIDL/dom.idl
+++ b/content/handlers/javascript/WebIDL/dom.idl
diff --git a/javascript/WebIDL/html.idl b/content/handlers/javascript/WebIDL/html.idl
index 73112f002..73112f002 100644
--- a/javascript/WebIDL/html.idl
+++ b/content/handlers/javascript/WebIDL/html.idl
diff --git a/javascript/WebIDL/uievents.idl b/content/handlers/javascript/WebIDL/uievents.idl
index 3f339f381..3f339f381 100644
--- a/javascript/WebIDL/uievents.idl
+++ b/content/handlers/javascript/WebIDL/uievents.idl
diff --git a/javascript/WebIDL/urlutils.idl b/content/handlers/javascript/WebIDL/urlutils.idl
index e79d4ad42..e79d4ad42 100644
--- a/javascript/WebIDL/urlutils.idl
+++ b/content/handlers/javascript/WebIDL/urlutils.idl
diff --git a/javascript/content.c b/content/handlers/javascript/content.c
index ef5614094..ef5614094 100644
--- a/javascript/content.c
+++ b/content/handlers/javascript/content.c
diff --git a/javascript/content.h b/content/handlers/javascript/content.h
index f8160b4b1..f8160b4b1 100644
--- a/javascript/content.h
+++ b/content/handlers/javascript/content.h
diff --git a/javascript/duktape/Console.bnd b/content/handlers/javascript/duktape/Console.bnd
index 734f0035a..734f0035a 100644
--- a/javascript/duktape/Console.bnd
+++ b/content/handlers/javascript/duktape/Console.bnd
diff --git a/javascript/duktape/Document.bnd b/content/handlers/javascript/duktape/Document.bnd
index 8658aec45..8658aec45 100644
--- a/javascript/duktape/Document.bnd
+++ b/content/handlers/javascript/duktape/Document.bnd
diff --git a/javascript/duktape/Element.bnd b/content/handlers/javascript/duktape/Element.bnd
index d34e8c1eb..d34e8c1eb 100644
--- a/javascript/duktape/Element.bnd
+++ b/content/handlers/javascript/duktape/Element.bnd
diff --git a/javascript/duktape/Event.bnd b/content/handlers/javascript/duktape/Event.bnd
index a0bc3c3e7..a0bc3c3e7 100644
--- a/javascript/duktape/Event.bnd
+++ b/content/handlers/javascript/duktape/Event.bnd
diff --git a/javascript/duktape/HTMLAnchorElement.bnd b/content/handlers/javascript/duktape/HTMLAnchorElement.bnd
index 3dcfef72e..3dcfef72e 100644
--- a/javascript/duktape/HTMLAnchorElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLAnchorElement.bnd
diff --git a/javascript/duktape/HTMLAppletElement.bnd b/content/handlers/javascript/duktape/HTMLAppletElement.bnd
index 8bf3ff2f7..8bf3ff2f7 100644
--- a/javascript/duktape/HTMLAppletElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLAppletElement.bnd
diff --git a/javascript/duktape/HTMLAreaElement.bnd b/content/handlers/javascript/duktape/HTMLAreaElement.bnd
index b6c17031c..b6c17031c 100644
--- a/javascript/duktape/HTMLAreaElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLAreaElement.bnd
diff --git a/javascript/duktape/HTMLBRElement.bnd b/content/handlers/javascript/duktape/HTMLBRElement.bnd
index 3b44b9777..3b44b9777 100644
--- a/javascript/duktape/HTMLBRElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLBRElement.bnd
diff --git a/javascript/duktape/HTMLBaseElement.bnd b/content/handlers/javascript/duktape/HTMLBaseElement.bnd
index 143aefd36..143aefd36 100644
--- a/javascript/duktape/HTMLBaseElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLBaseElement.bnd
diff --git a/javascript/duktape/HTMLBodyElement.bnd b/content/handlers/javascript/duktape/HTMLBodyElement.bnd
index a283f897c..a283f897c 100644
--- a/javascript/duktape/HTMLBodyElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLBodyElement.bnd
diff --git a/javascript/duktape/HTMLButtonElement.bnd b/content/handlers/javascript/duktape/HTMLButtonElement.bnd
index 53431aa04..53431aa04 100644
--- a/javascript/duktape/HTMLButtonElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLButtonElement.bnd
diff --git a/javascript/duktape/HTMLCollection.bnd b/content/handlers/javascript/duktape/HTMLCollection.bnd
index 2ffe7027b..2ffe7027b 100644
--- a/javascript/duktape/HTMLCollection.bnd
+++ b/content/handlers/javascript/duktape/HTMLCollection.bnd
diff --git a/javascript/duktape/HTMLDivElement.bnd b/content/handlers/javascript/duktape/HTMLDivElement.bnd
index 759e34d96..759e34d96 100644
--- a/javascript/duktape/HTMLDivElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLDivElement.bnd
diff --git a/javascript/duktape/HTMLElement.bnd b/content/handlers/javascript/duktape/HTMLElement.bnd
index b3de9c8fe..b3de9c8fe 100644
--- a/javascript/duktape/HTMLElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLElement.bnd
diff --git a/javascript/duktape/HTMLFontElement.bnd b/content/handlers/javascript/duktape/HTMLFontElement.bnd
index e648a72e1..e648a72e1 100644
--- a/javascript/duktape/HTMLFontElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLFontElement.bnd
diff --git a/javascript/duktape/HTMLFormElement.bnd b/content/handlers/javascript/duktape/HTMLFormElement.bnd
index 3906cf0b3..3906cf0b3 100644
--- a/javascript/duktape/HTMLFormElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLFormElement.bnd
diff --git a/javascript/duktape/HTMLFrameElement.bnd b/content/handlers/javascript/duktape/HTMLFrameElement.bnd
index ee5cfe3d0..ee5cfe3d0 100644
--- a/javascript/duktape/HTMLFrameElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLFrameElement.bnd
diff --git a/javascript/duktape/HTMLFrameSetElement.bnd b/content/handlers/javascript/duktape/HTMLFrameSetElement.bnd
index cc66e93d8..cc66e93d8 100644
--- a/javascript/duktape/HTMLFrameSetElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLFrameSetElement.bnd
diff --git a/javascript/duktape/HTMLHRElement.bnd b/content/handlers/javascript/duktape/HTMLHRElement.bnd
index 421ec499b..421ec499b 100644
--- a/javascript/duktape/HTMLHRElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLHRElement.bnd
diff --git a/javascript/duktape/HTMLHTMLElement.bnd b/content/handlers/javascript/duktape/HTMLHTMLElement.bnd
index 01697d860..01697d860 100644
--- a/javascript/duktape/HTMLHTMLElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLHTMLElement.bnd
diff --git a/javascript/duktape/HTMLHeadingElement.bnd b/content/handlers/javascript/duktape/HTMLHeadingElement.bnd
index be51223c1..be51223c1 100644
--- a/javascript/duktape/HTMLHeadingElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLHeadingElement.bnd
diff --git a/javascript/duktape/HTMLIFrameElement.bnd b/content/handlers/javascript/duktape/HTMLIFrameElement.bnd
index 64353769c..64353769c 100644
--- a/javascript/duktape/HTMLIFrameElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLIFrameElement.bnd
diff --git a/javascript/duktape/HTMLImageElement.bnd b/content/handlers/javascript/duktape/HTMLImageElement.bnd
index 96b35b6f8..96b35b6f8 100644
--- a/javascript/duktape/HTMLImageElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLImageElement.bnd
diff --git a/javascript/duktape/HTMLInputElement.bnd b/content/handlers/javascript/duktape/HTMLInputElement.bnd
index 23645d0cd..23645d0cd 100644
--- a/javascript/duktape/HTMLInputElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLInputElement.bnd
diff --git a/javascript/duktape/HTMLLIElement.bnd b/content/handlers/javascript/duktape/HTMLLIElement.bnd
index a585693c0..a585693c0 100644
--- a/javascript/duktape/HTMLLIElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLLIElement.bnd
diff --git a/javascript/duktape/HTMLLabelElement.bnd b/content/handlers/javascript/duktape/HTMLLabelElement.bnd
index 018f798bd..018f798bd 100644
--- a/javascript/duktape/HTMLLabelElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLLabelElement.bnd
diff --git a/javascript/duktape/HTMLLegendElement.bnd b/content/handlers/javascript/duktape/HTMLLegendElement.bnd
index 1bb95a94a..1bb95a94a 100644
--- a/javascript/duktape/HTMLLegendElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLLegendElement.bnd
diff --git a/javascript/duktape/HTMLLinkElement.bnd b/content/handlers/javascript/duktape/HTMLLinkElement.bnd
index b215d76c0..b215d76c0 100644
--- a/javascript/duktape/HTMLLinkElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLLinkElement.bnd
diff --git a/javascript/duktape/HTMLMapElement.bnd b/content/handlers/javascript/duktape/HTMLMapElement.bnd
index 0603f6f81..0603f6f81 100644
--- a/javascript/duktape/HTMLMapElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLMapElement.bnd
diff --git a/javascript/duktape/HTMLMarqueeElement.bnd b/content/handlers/javascript/duktape/HTMLMarqueeElement.bnd
index 16fbdc82c..16fbdc82c 100644
--- a/javascript/duktape/HTMLMarqueeElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLMarqueeElement.bnd
diff --git a/javascript/duktape/HTMLMenuElement.bnd b/content/handlers/javascript/duktape/HTMLMenuElement.bnd
index c7097b706..c7097b706 100644
--- a/javascript/duktape/HTMLMenuElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLMenuElement.bnd
diff --git a/javascript/duktape/HTMLMetaElement.bnd b/content/handlers/javascript/duktape/HTMLMetaElement.bnd
index f9ecd4b07..f9ecd4b07 100644
--- a/javascript/duktape/HTMLMetaElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLMetaElement.bnd
diff --git a/javascript/duktape/HTMLOListElement.bnd b/content/handlers/javascript/duktape/HTMLOListElement.bnd
index 8c12712a9..8c12712a9 100644
--- a/javascript/duktape/HTMLOListElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLOListElement.bnd
diff --git a/javascript/duktape/HTMLObjectElement.bnd b/content/handlers/javascript/duktape/HTMLObjectElement.bnd
index 2d07a7bb2..2d07a7bb2 100644
--- a/javascript/duktape/HTMLObjectElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLObjectElement.bnd
diff --git a/javascript/duktape/HTMLOptionElement.bnd b/content/handlers/javascript/duktape/HTMLOptionElement.bnd
index d5094b7fa..d5094b7fa 100644
--- a/javascript/duktape/HTMLOptionElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLOptionElement.bnd
diff --git a/javascript/duktape/HTMLParagraphElement.bnd b/content/handlers/javascript/duktape/HTMLParagraphElement.bnd
index cc9ad83b5..cc9ad83b5 100644
--- a/javascript/duktape/HTMLParagraphElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLParagraphElement.bnd
diff --git a/javascript/duktape/HTMLParamElement.bnd b/content/handlers/javascript/duktape/HTMLParamElement.bnd
index 8fbe6fca6..8fbe6fca6 100644
--- a/javascript/duktape/HTMLParamElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLParamElement.bnd
diff --git a/javascript/duktape/HTMLPreElement.bnd b/content/handlers/javascript/duktape/HTMLPreElement.bnd
index 06f6a76a9..06f6a76a9 100644
--- a/javascript/duktape/HTMLPreElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLPreElement.bnd
diff --git a/javascript/duktape/HTMLQuoteElement.bnd b/content/handlers/javascript/duktape/HTMLQuoteElement.bnd
index 9e62f5d78..9e62f5d78 100644
--- a/javascript/duktape/HTMLQuoteElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLQuoteElement.bnd
diff --git a/javascript/duktape/HTMLScriptElement.bnd b/content/handlers/javascript/duktape/HTMLScriptElement.bnd
index b3b22665a..b3b22665a 100644
--- a/javascript/duktape/HTMLScriptElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLScriptElement.bnd
diff --git a/javascript/duktape/HTMLSelectElement.bnd b/content/handlers/javascript/duktape/HTMLSelectElement.bnd
index 36a5d1da4..36a5d1da4 100644
--- a/javascript/duktape/HTMLSelectElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLSelectElement.bnd
diff --git a/javascript/duktape/HTMLStyleElement.bnd b/content/handlers/javascript/duktape/HTMLStyleElement.bnd
index 45100876f..45100876f 100644
--- a/javascript/duktape/HTMLStyleElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLStyleElement.bnd
diff --git a/javascript/duktape/HTMLTableCaptionElement.bnd b/content/handlers/javascript/duktape/HTMLTableCaptionElement.bnd
index 75754ccac..75754ccac 100644
--- a/javascript/duktape/HTMLTableCaptionElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTableCaptionElement.bnd
diff --git a/javascript/duktape/HTMLTableCellElement.bnd b/content/handlers/javascript/duktape/HTMLTableCellElement.bnd
index 7040344c3..7040344c3 100644
--- a/javascript/duktape/HTMLTableCellElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTableCellElement.bnd
diff --git a/javascript/duktape/HTMLTableColElement.bnd b/content/handlers/javascript/duktape/HTMLTableColElement.bnd
index ec7a954de..ec7a954de 100644
--- a/javascript/duktape/HTMLTableColElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTableColElement.bnd
diff --git a/javascript/duktape/HTMLTableElement.bnd b/content/handlers/javascript/duktape/HTMLTableElement.bnd
index cd6d35769..cd6d35769 100644
--- a/javascript/duktape/HTMLTableElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTableElement.bnd
diff --git a/javascript/duktape/HTMLTableRowElement.bnd b/content/handlers/javascript/duktape/HTMLTableRowElement.bnd
index f736817b0..f736817b0 100644
--- a/javascript/duktape/HTMLTableRowElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTableRowElement.bnd
diff --git a/javascript/duktape/HTMLTableSectionElement.bnd b/content/handlers/javascript/duktape/HTMLTableSectionElement.bnd
index 276533b3b..276533b3b 100644
--- a/javascript/duktape/HTMLTableSectionElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTableSectionElement.bnd
diff --git a/javascript/duktape/HTMLTextAreaElement.bnd b/content/handlers/javascript/duktape/HTMLTextAreaElement.bnd
index a0fc1bf7b..a0fc1bf7b 100644
--- a/javascript/duktape/HTMLTextAreaElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTextAreaElement.bnd
diff --git a/javascript/duktape/HTMLTitleElement.bnd b/content/handlers/javascript/duktape/HTMLTitleElement.bnd
index dee1c0749..dee1c0749 100644
--- a/javascript/duktape/HTMLTitleElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLTitleElement.bnd
diff --git a/javascript/duktape/Location.bnd b/content/handlers/javascript/duktape/Location.bnd
index ca7e90509..ca7e90509 100644
--- a/javascript/duktape/Location.bnd
+++ b/content/handlers/javascript/duktape/Location.bnd
diff --git a/javascript/duktape/Makefile b/content/handlers/javascript/duktape/Makefile
index 89353c340..89f83b153 100644
--- a/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -4,27 +4,27 @@
# Included by javascript/Makefile
#
-javascript/dukky.c: $(OBJROOT)/duktape/binding.h
+content/handlers/javascript/dukky.c: $(OBJROOT)/duktape/binding.h
-BINDINGS := $(wildcard javascript/duktape/*.bnd)
+BINDINGS := $(wildcard content/handlers/javascript/duktape/*.bnd)
# ensure genbind generates debugging files
GBFLAGS+=-D
-$(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile: javascript/duktape/netsurf.bnd $(BINDINGS)
+$(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile: content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
$(Q)mkdir -p $(OBJROOT)/duktape
$(VQ)echo " GENBIND: $<"
- $(Q)nsgenbind $(GBFLAGS) -I javascript/WebIDL $< $(OBJROOT)/duktape
+ $(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $< $(OBJROOT)/duktape
$(VQ)echo " GENBIND: completed"
# create unimplemented report for doxygen
-Docs/UnimplementedJavascript.txt: javascript/duktape/netsurf.bnd $(BINDINGS)
+Docs/UnimplementedJavascript.txt: content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
$(Q)mkdir -p $(OBJROOT)/duktape
$(VQ)echo "/** \page unimplemented Unimplemented javascript bindings" > $@
$(VQ)echo "This is a list of all the binding methods, getters and setters without an implementation in a binding." >> $@
$(VQ)echo "" >> $@
$(VQ)echo " GENBIND: $<"
- $(Q)nsgenbind $(GBFLAGS) -Wunimplemented -I javascript/WebIDL $< $(OBJROOT)/duktape 2>&1 >/dev/null | grep "Unimplemented" | cut -d' ' -f4- | sort -k 2 | awk '{print $$0"\\n" }' >> $@
+ $(Q)nsgenbind $(GBFLAGS) -Wunimplemented -I content/handlers/javascript/WebIDL $< $(OBJROOT)/duktape 2>&1 >/dev/null | grep "Unimplemented" | cut -d' ' -f4- | sort -k 2 | awk '{print $$0"\\n" }' >> $@
$(VQ)echo "*/" >> $@
ifeq ($(filter $(MAKECMDGOALS),clean test coverage),)
diff --git a/javascript/duktape/Navigator.bnd b/content/handlers/javascript/duktape/Navigator.bnd
index b18ca8e83..b18ca8e83 100644
--- a/javascript/duktape/Navigator.bnd
+++ b/content/handlers/javascript/duktape/Navigator.bnd
diff --git a/javascript/duktape/Node.bnd b/content/handlers/javascript/duktape/Node.bnd
index f237c876a..f237c876a 100644
--- a/javascript/duktape/Node.bnd
+++ b/content/handlers/javascript/duktape/Node.bnd
diff --git a/javascript/duktape/NodeList.bnd b/content/handlers/javascript/duktape/NodeList.bnd
index 7ddf56d15..7ddf56d15 100644
--- a/javascript/duktape/NodeList.bnd
+++ b/content/handlers/javascript/duktape/NodeList.bnd
diff --git a/javascript/duktape/Window.bnd b/content/handlers/javascript/duktape/Window.bnd
index 489587899..489587899 100644
--- a/javascript/duktape/Window.bnd
+++ b/content/handlers/javascript/duktape/Window.bnd
diff --git a/javascript/duktape/duk_config.h b/content/handlers/javascript/duktape/duk_config.h
index a3da70a3f..a3da70a3f 100644
--- a/javascript/duktape/duk_config.h
+++ b/content/handlers/javascript/duktape/duk_config.h
diff --git a/javascript/duktape/duk_custom.h b/content/handlers/javascript/duktape/duk_custom.h
index 1f98b7825..1f98b7825 100644
--- a/javascript/duktape/duk_custom.h
+++ b/content/handlers/javascript/duktape/duk_custom.h
diff --git a/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index 7dd3bd71e..7dd3bd71e 100644
--- a/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
diff --git a/javascript/duktape/dukky.h b/content/handlers/javascript/duktape/dukky.h
index 0c3ff0e25..0c3ff0e25 100644
--- a/javascript/duktape/dukky.h
+++ b/content/handlers/javascript/duktape/dukky.h
diff --git a/javascript/duktape/duktape.c b/content/handlers/javascript/duktape/duktape.c
index eb4c77a04..eb4c77a04 100644
--- a/javascript/duktape/duktape.c
+++ b/content/handlers/javascript/duktape/duktape.c
diff --git a/javascript/duktape/duktape.h b/content/handlers/javascript/duktape/duktape.h
index a727187eb..a727187eb 100644
--- a/javascript/duktape/duktape.h
+++ b/content/handlers/javascript/duktape/duktape.h
diff --git a/javascript/duktape/netsurf.bnd b/content/handlers/javascript/duktape/netsurf.bnd
index 4aca4752f..4aca4752f 100644
--- a/javascript/duktape/netsurf.bnd
+++ b/content/handlers/javascript/duktape/netsurf.bnd
diff --git a/javascript/fetcher.c b/content/handlers/javascript/fetcher.c
index 839df265a..839df265a 100644
--- a/javascript/fetcher.c
+++ b/content/handlers/javascript/fetcher.c
diff --git a/javascript/fetcher.h b/content/handlers/javascript/fetcher.h
index f39714089..f39714089 100644
--- a/javascript/fetcher.h
+++ b/content/handlers/javascript/fetcher.h
diff --git a/javascript/js.h b/content/handlers/javascript/js.h
index 2929d0b5e..2929d0b5e 100644
--- a/javascript/js.h
+++ b/content/handlers/javascript/js.h
diff --git a/javascript/none/Makefile b/content/handlers/javascript/none/Makefile
index ec7826da4..ec7826da4 100644
--- a/javascript/none/Makefile
+++ b/content/handlers/javascript/none/Makefile
diff --git a/javascript/none/none.c b/content/handlers/javascript/none/none.c
index 9a8b0a49d..9a8b0a49d 100644
--- a/javascript/none/none.c
+++ b/content/handlers/javascript/none/none.c
diff --git a/javascript/Makefile b/javascript/Makefile
deleted file mode 100644
index 36f123b64..000000000
--- a/javascript/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# NetSurf javascript source file inclusion
-#
-# Included by Makefile
-#
-
-# Check if jsapi is required
-ifeq ($(NETSURF_USE_JS),YES)
-WANT_JS_SOURCE := YES
-else
-ifeq ($(NETSURF_USE_MOZJS),YES)
-WANT_JS_SOURCE := YES
-endif
-endif
-
-S_JAVASCRIPT_BINDING:=
-
-ifeq ($(WANT_JS_SOURCE),YES)
-# JSAPI (spidemonkey)
-include javascript/jsapi/Makefile
-else
-ifeq ($(NETSURF_USE_DUKTAPE),YES)
-# Duktape
-include javascript/duktape/Makefile
-else
-# None
-include javascript/none/Makefile
-endif
-endif
-
-# Fetcher for javascript scheme is always required
-S_JAVASCRIPT += fetcher.c
-
-S_JAVASCRIPT := $(addprefix javascript/,$(S_JAVASCRIPT)) $(S_JAVASCRIPT_BINDING)