[refactor] src/ecmascript -> src/js

src/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/Makefile.config
 SUBDIRS-$(CONFIG_BOOKMARKS)	+= bookmarks
 SUBDIRS-$(CONFIG_COOKIES)	+= cookies
 SUBDIRS-$(CONFIG_DOM)		+= dom
-SUBDIRS-$(CONFIG_ECMASCRIPT)	+= ecmascript
+SUBDIRS-$(CONFIG_ECMASCRIPT)	+= js
 SUBDIRS-$(CONFIG_FORMHIST)	+= formhist
 SUBDIRS-$(CONFIG_GLOBHIST)	+= globhist
 SUBDIRS-$(CONFIG_SCRIPTING)	+= scripting

src/dialogs/info.c

@@ -24,7 +24,7 @@
 #include "dialogs/info.h"
 #include "document/renderer.h"
 #ifdef CONFIG_ECMASCRIPT_SMJS
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
 #endif
 #include "intl/libintl.h"
 #include "main/select.h"

src/document/document.c

@@ -63,7 +63,7 @@
 #include "document/renderer.h"
 
 #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS)
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
 #endif
 
 #ifdef CONFIG_LIBDOM

src/document/libdom/doc.c

@@ -20,7 +20,7 @@
 #include "document/libdom/doc.h"
 
 #ifdef CONFIG_QUICKJS
-#include "ecmascript/quickjs/mapa.h"
+#include "js/quickjs/mapa.h"
 #endif
 
 #include "intl/charsets.h"

src/document/libdom/renderer.c

@@ -17,7 +17,7 @@
 #include "document/libdom/mapa.h"
 #include "document/libdom/renderer.h"
 #include "document/plain/renderer.h"
-#include "ecmascript/libdom/parse.h"
+#include "js/libdom/parse.h"
 
 static bool
 dump_dom_element_closing(struct string *buf, dom_node *node)

src/document/libdom/renderer2.c

@@ -20,7 +20,7 @@
 #include "document/libdom/mapa.h"
 #include "document/libdom/renderer2.h"
 #include "document/view.h"
-#include "ecmascript/libdom/parse.h"
+#include "js/libdom/parse.h"
 #include "util/hash.h"
 #include "util/string.h"
 

src/document/renderer.c

@@ -28,7 +28,7 @@
 #include "document/renderer.h"
 #include "document/view.h"
 #ifdef CONFIG_ECMASCRIPT
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
 #endif
 #include "encoding/encoding.h"
 #include "intl/charsets.h"

src/ecmascript/ecmascript-c.cpp

@@ -1 +0,0 @@
-#include "ecmascript/ecmascript-c.c"

src/ecmascript/ecmascript.cpp

@@ -1 +0,0 @@
-#include "ecmascript/ecmascript.c"

src/js/css2xpath.cpp

@@ -15,7 +15,7 @@
 #include <string>
 #include <regex>
 
-#include "ecmascript/css2xpath.h"
+#include "js/css2xpath.h"
 
 namespace std
 {

src/js/ecmascript-c.c

@@ -6,7 +6,7 @@
 
 #include "elinks.h"
 
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
 
 #include "dialogs/status.h"
 #include "document/document.h"
@@ -14,19 +14,19 @@
 #include "document/libdom/mapa.h"
 #include "document/libdom/renderer2.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
 #ifdef CONFIG_MUJS
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
 #endif
 #ifdef CONFIG_QUICKJS
-#include "ecmascript/quickjs.h"
+#include "js/quickjs.h"
-#include "ecmascript/quickjs/element.h"
+#include "js/quickjs/element.h"
 #endif
 #ifdef CONFIG_ECMASCRIPT_SMJS
-#include "ecmascript/spidermonkey.h"
+#include "js/spidermonkey.h"
-#include "ecmascript/spidermonkey/element.h"
+#include "js/spidermonkey/element.h"
 #endif
 #include "intl/libintl.h"
 #include "protocol/uri.h"

src/js/ecmascript-c.cpp

@@ -0,0 +1 @@
+#include "js/ecmascript-c.c"

src/js/ecmascript-c.h

@@ -2,7 +2,7 @@
 #define EL__ECMASCRIPT_ECMASCRIPT_C_H
 
 #include "document/document.h"
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
 #include "main/module.h"
 #include "terminal/kbd.h"
 #include "util/lists.h"

src/js/ecmascript.c

@@ -10,7 +10,7 @@
 
 #include "elinks.h"
 
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
 
 #include "config/home.h"
 #include "config/options.h"
@@ -22,20 +22,20 @@
 #include "document/libdom/renderer2.h"
 #include "document/renderer.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/libdom/parse.h"
+#include "js/libdom/parse.h"
 #ifdef CONFIG_MUJS
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
 #else
 #ifdef CONFIG_QUICKJS
-#include "ecmascript/quickjs.h"
+#include "js/quickjs.h"
-#include "ecmascript/quickjs/document.h"
+#include "js/quickjs/document.h"
 #else
-#include "ecmascript/spidermonkey.h"
+#include "js/spidermonkey.h"
 #endif
 #endif
-#include "ecmascript/timer.h"
+#include "js/timer.h"
 #include "intl/libintl.h"
 #include "main/module.h"
 #include "main/main.h"

src/js/ecmascript.cpp

@@ -0,0 +1 @@
+#include "js/ecmascript.c"

src/js/localstorage-db.c

@@ -11,7 +11,7 @@
 
 #include "elinks.h"
 
-#include "ecmascript/localstorage-db.h"
+#include "js/localstorage-db.h"
 #include "util/string.h"
 
 int

src/js/mujs.c

@@ -28,27 +28,27 @@
 #include "document/forms.h"
 #include "document/renderer.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/console.h"
+#include "js/mujs/console.h"
-#include "ecmascript/mujs/customevent.h"
+#include "js/mujs/customevent.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/domparser.h"
+#include "js/mujs/domparser.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/event.h"
+#include "js/mujs/event.h"
-#include "ecmascript/mujs/history.h"
+#include "js/mujs/history.h"
-#include "ecmascript/mujs/keyboard.h"
+#include "js/mujs/keyboard.h"
-#include "ecmascript/mujs/localstorage.h"
+#include "js/mujs/localstorage.h"
-#include "ecmascript/mujs/location.h"
+#include "js/mujs/location.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs/message.h"
+#include "js/mujs/message.h"
-#include "ecmascript/mujs/navigator.h"
+#include "js/mujs/navigator.h"
-#include "ecmascript/mujs/node.h"
+#include "js/mujs/node.h"
-#include "ecmascript/mujs/screen.h"
+#include "js/mujs/screen.h"
-#include "ecmascript/mujs/unibar.h"
+#include "js/mujs/unibar.h"
-#include "ecmascript/mujs/url.h"
+#include "js/mujs/url.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
-#include "ecmascript/mujs/xhr.h"
+#include "js/mujs/xhr.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "osdep/newwin.h"

src/js/mujs/attr.c

@@ -13,10 +13,10 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/attr.h"
+#include "js/mujs/attr.h"
 
 static void
 mjs_attr_get_property_name(js_State *J)

src/js/mujs/attributes.c

@@ -16,11 +16,11 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/attr.h"
+#include "js/mujs/attr.h"
-#include "ecmascript/mujs/attributes.h"
+#include "js/mujs/attributes.h"
 
 void *map_attributes;
 void *map_rev_attributes;

src/js/mujs/collection.c

@@ -16,11 +16,11 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/collection.h"
+#include "js/mujs/collection.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
 
 void *map_collections;
 void *map_rev_collections;

src/js/mujs/collection2.c

@@ -16,12 +16,12 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/collection.h"
+#include "js/mujs/collection.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
 
 static void
 mjs_htmlCollection2_get_property_length(js_State *J)

src/js/mujs/console.c

@@ -10,9 +10,9 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/console.h"
+#include "js/mujs/console.h"
 #include "main/main.h"
 
 #define DEBUG 0

src/js/mujs/css.c

@@ -16,11 +16,11 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/css.h"
+#include "js/mujs/css.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
 
 static void
 mjs_CSSStyleDeclaration_get_property_length(js_State *J)

src/js/mujs/customevent.c

@@ -12,11 +12,11 @@
 
 #include "document/document.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/customevent.h"
+#include "js/mujs/customevent.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
 #include "intl/charsets.h"
 #include "terminal/event.h"
 #include "viewer/text/vs.h"

src/js/mujs/dataset.c

@@ -16,12 +16,12 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/dataset.h"
+#include "js/mujs/dataset.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
 
 static void
 mjs_dataset_finalizer(js_State *J, void *node)

src/js/mujs/document.c

@@ -15,7 +15,7 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
 
 #include "bfu/dialog.h"
 #include "cache/cache.h"
@@ -27,24 +27,24 @@
 #include "document/forms.h"
 #include "document/libdom/doc.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/libdom/parse.h"
+#include "js/libdom/parse.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/collection.h"
+#include "js/mujs/collection.h"
-#include "ecmascript/mujs/event.h"
+#include "js/mujs/event.h"
-#include "ecmascript/mujs/form.h"
+#include "js/mujs/form.h"
-#include "ecmascript/mujs/forms.h"
+#include "js/mujs/forms.h"
-#include "ecmascript/mujs/fragment.h"
+#include "js/mujs/fragment.h"
-#include "ecmascript/mujs/implementation.h"
+#include "js/mujs/implementation.h"
-#include "ecmascript/mujs/location.h"
+#include "js/mujs/location.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/nodelist.h"
+#include "js/mujs/nodelist.h"
-#include "ecmascript/mujs/nodelist2.h"
+#include "js/mujs/nodelist2.h"
-#include "ecmascript/mujs/text.h"
+#include "js/mujs/text.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "osdep/newwin.h"

src/js/mujs/domparser.c

@@ -11,11 +11,11 @@
 #include "elinks.h"
 
 #include "document/libdom/doc.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/domparser.h"
+#include "js/mujs/domparser.h"
 #include "intl/charsets.h"
 #include "terminal/event.h"
 

src/js/mujs/domrect.c

@@ -10,10 +10,10 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/domrect.h"
+#include "js/mujs/domrect.h"
 
 struct eljs_domrect {
 	double x;

src/js/mujs/element.c

@@ -28,26 +28,26 @@
 #include "document/libdom/mapa.h"
 #include "document/libdom/renderer2.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/attr.h"
+#include "js/mujs/attr.h"
-#include "ecmascript/mujs/attributes.h"
+#include "js/mujs/attributes.h"
-#include "ecmascript/mujs/collection.h"
+#include "js/mujs/collection.h"
-#include "ecmascript/mujs/dataset.h"
+#include "js/mujs/dataset.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/domrect.h"
+#include "js/mujs/domrect.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/event.h"
+#include "js/mujs/event.h"
-#include "ecmascript/mujs/fragment.h"
+#include "js/mujs/fragment.h"
-#include "ecmascript/mujs/keyboard.h"
+#include "js/mujs/keyboard.h"
-#include "ecmascript/mujs/nodelist.h"
+#include "js/mujs/nodelist.h"
-#include "ecmascript/mujs/nodelist2.h"
+#include "js/mujs/nodelist2.h"
-#include "ecmascript/mujs/style.h"
+#include "js/mujs/style.h"
-#include "ecmascript/mujs/text.h"
+#include "js/mujs/text.h"
-#include "ecmascript/mujs/tokenlist.h"
+#include "js/mujs/tokenlist.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "osdep/newwin.h"

src/js/mujs/event.c

@@ -10,11 +10,11 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/event.h"
+#include "js/mujs/event.h"
 #include "intl/charsets.h"
 #include "terminal/event.h"
 

src/js/mujs/form.c

@@ -17,14 +17,14 @@
 
 #include "document/forms.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/form.h"
+#include "js/mujs/form.h"
-#include "ecmascript/mujs/forms.h"
+#include "js/mujs/forms.h"
-#include "ecmascript/mujs/input.h"
+#include "js/mujs/input.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "session/session.h"
 #include "viewer/text/form.h"
 #include "viewer/text/vs.h"

src/js/mujs/forms.c

@@ -13,14 +13,14 @@
 #include "document/document.h"
 #include "document/forms.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/form.h"
+#include "js/mujs/form.h"
-#include "ecmascript/mujs/forms.h"
+#include "js/mujs/forms.h"
-#include "ecmascript/mujs/input.h"
+#include "js/mujs/input.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "viewer/text/form.h"
 #include "viewer/text/vs.h"
 

src/js/mujs/fragment.c

@@ -28,25 +28,25 @@
 #include "document/libdom/mapa.h"
 #include "document/libdom/renderer2.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/attr.h"
+#include "js/mujs/attr.h"
-#include "ecmascript/mujs/attributes.h"
+#include "js/mujs/attributes.h"
-#include "ecmascript/mujs/collection.h"
+#include "js/mujs/collection.h"
-#include "ecmascript/mujs/dataset.h"
+#include "js/mujs/dataset.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/domrect.h"
+#include "js/mujs/domrect.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/event.h"
+#include "js/mujs/event.h"
-#include "ecmascript/mujs/fragment.h"
+#include "js/mujs/fragment.h"
-#include "ecmascript/mujs/keyboard.h"
+#include "js/mujs/keyboard.h"
-#include "ecmascript/mujs/nodelist.h"
+#include "js/mujs/nodelist.h"
-#include "ecmascript/mujs/nodelist2.h"
+#include "js/mujs/nodelist2.h"
-#include "ecmascript/mujs/style.h"
+#include "js/mujs/style.h"
-#include "ecmascript/mujs/tokenlist.h"
+#include "js/mujs/tokenlist.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "osdep/newwin.h"

src/js/mujs/history.c

@@ -11,10 +11,10 @@
 #include "elinks.h"
 
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/history.h"
+#include "js/mujs/history.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "session/history.h"
 #include "session/location.h"
 #include "session/session.h"

src/js/mujs/implementation.c

@@ -11,11 +11,11 @@
 #include "elinks.h"
 
 #include "document/libdom/doc.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/libdom/parse.h"
+#include "js/libdom/parse.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/implementation.h"
+#include "js/mujs/implementation.h"
 #include "util/conv.h"
 
 static void

src/js/mujs/input.c

@@ -13,14 +13,14 @@
 #include "dialogs/status.h"
 #include "document/document.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/form.h"
+#include "js/mujs/form.h"
-#include "ecmascript/mujs/forms.h"
+#include "js/mujs/forms.h"
-#include "ecmascript/mujs/input.h"
+#include "js/mujs/input.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "intl/charsets.h"
 #include "viewer/text/draw.h"
 #include "viewer/text/form.h"

src/js/mujs/keyboard.c

@@ -10,13 +10,13 @@
 
 #include "elinks.h"
 
-#include "ecmascript/libdom/dom.h"
+#include "js/libdom/dom.h"
 
 #include "document/libdom/doc.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/keyboard.h"
+#include "js/mujs/keyboard.h"
 #include "intl/charsets.h"
 #include "terminal/event.h"
 

src/js/mujs/localstorage.c

@@ -12,10 +12,10 @@
 
 #include "bfu/leds.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/localstorage-db.h"
+#include "js/localstorage-db.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/localstorage.h"
+#include "js/mujs/localstorage.h"
 #include "session/session.h"
 #include "viewer/text/vs.h"
 

src/js/mujs/location.c

@@ -12,10 +12,10 @@
 
 #include "document/document.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/location.h"
+#include "js/mujs/location.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "protocol/uri.h"
 #include "session/history.h"
 #include "session/location.h"

src/js/mujs/mapa.c

@@ -9,9 +9,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs/xhr.h"
+#include "js/mujs/xhr.h"
 #include "util/hash.h"
 #include "util/memory.h"
 #include "util/string.h"

src/js/mujs/message.c

@@ -10,9 +10,9 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/message.h"
+#include "js/mujs/message.h"
 
 static void mjs_messageEvent_get_property_data(js_State *J);
 static void mjs_messageEvent_get_property_lastEventId(js_State *J);

src/js/mujs/navigator.c

@@ -10,9 +10,9 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/navigator.h"
+#include "js/mujs/navigator.h"
 #include "intl/libintl.h"
 #include "osdep/sysname.h"
 #include "protocol/http/http.h"

src/js/mujs/node.c

@@ -21,11 +21,11 @@
 #include "document/document.h"
 #include "document/forms.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/node.h"
+#include "js/mujs/node.h"
-#include "ecmascript/timer.h"
+#include "js/timer.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "main/timer.h"

src/js/mujs/nodelist.c

@@ -15,12 +15,12 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/nodelist.h"
+#include "js/mujs/nodelist.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 
 //void *map_nodelist;
 //void *map_rev_nodelist;

src/js/mujs/nodelist2.c

@@ -10,13 +10,13 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/nodelist2.h"
+#include "js/mujs/nodelist2.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 
 void *map_nodelist2;
 void *map_rev_nodelist2;

src/js/mujs/screen.c

@@ -11,10 +11,10 @@
 #include "elinks.h"
 
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/screen.h"
+#include "js/mujs/screen.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "session/session.h"
 #include "viewer/text/vs.h"
 

src/js/mujs/style.c

@@ -14,10 +14,10 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/style.h"
+#include "js/mujs/style.h"
 
 static void
 mjs_style(js_State *J, const char *property)

src/js/mujs/text.c

@@ -28,26 +28,26 @@
 #include "document/libdom/mapa.h"
 #include "document/libdom/renderer2.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/ecmascript-c.h"
+#include "js/ecmascript-c.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/attr.h"
+#include "js/mujs/attr.h"
-#include "ecmascript/mujs/attributes.h"
+#include "js/mujs/attributes.h"
-#include "ecmascript/mujs/collection.h"
+#include "js/mujs/collection.h"
-#include "ecmascript/mujs/dataset.h"
+#include "js/mujs/dataset.h"
-#include "ecmascript/mujs/document.h"
+#include "js/mujs/document.h"
-#include "ecmascript/mujs/domrect.h"
+#include "js/mujs/domrect.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/event.h"
+#include "js/mujs/event.h"
-#include "ecmascript/mujs/fragment.h"
+#include "js/mujs/fragment.h"
-#include "ecmascript/mujs/keyboard.h"
+#include "js/mujs/keyboard.h"
-#include "ecmascript/mujs/nodelist.h"
+#include "js/mujs/nodelist.h"
-#include "ecmascript/mujs/nodelist2.h"
+#include "js/mujs/nodelist2.h"
-#include "ecmascript/mujs/style.h"
+#include "js/mujs/style.h"
-#include "ecmascript/mujs/text.h"
+#include "js/mujs/text.h"
-#include "ecmascript/mujs/tokenlist.h"
+#include "js/mujs/tokenlist.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "osdep/newwin.h"

src/js/mujs/tokenlist.c

@@ -16,11 +16,11 @@
 #include "elinks.h"
 
 #include "document/libdom/corestrings.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs/mapa.h"
+#include "js/mujs/mapa.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/tokenlist.h"
+#include "js/mujs/tokenlist.h"
 
 static void
 mjs_tokenlist_add(js_State *J)

src/js/mujs/unibar.c

@@ -12,9 +12,9 @@
 
 #include "dialogs/status.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/unibar.h"
+#include "js/mujs/unibar.h"
 #include "main/select.h"
 #include "session/session.h"
 #include "viewer/text/vs.h"

src/js/mujs/url.c

@@ -10,9 +10,9 @@
 
 #include "elinks.h"
 
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/url.h"
+#include "js/mujs/url.h"
 #include "protocol/uri.h"
 
 struct eljs_url {

src/js/mujs/window.c

@@ -28,15 +28,15 @@
 #include "document/document.h"
 #include "document/forms.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+#include "js/ecmascript.h"
-#include "ecmascript/mujs.h"
+#include "js/mujs.h"
-#include "ecmascript/mujs/css.h"
+#include "js/mujs/css.h"
-#include "ecmascript/mujs/element.h"
+#include "js/mujs/element.h"
-#include "ecmascript/mujs/keyboard.h"
+#include "js/mujs/keyboard.h"
-#include "ecmascript/mujs/location.h"
+#include "js/mujs/location.h"
-#include "ecmascript/mujs/message.h"
+#include "js/mujs/message.h"
-#include "ecmascript/mujs/window.h"
+#include "js/mujs/window.h"
-#include "ecmascript/timer.h"
+#include "js/timer.h"
 #include "intl/libintl.h"
 #include "main/select.h"
 #include "main/timer.h"