From 59fc662651fffede865fac21aab0e916840d315d Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 24 Sep 2024 21:51:24 +0200 Subject: [PATCH] [refactor] src/ecmascript -> src/js --- src/Makefile | 2 +- src/dialogs/info.c | 2 +- src/document/document.c | 2 +- src/document/libdom/doc.c | 2 +- src/document/libdom/renderer.c | 2 +- src/document/libdom/renderer2.c | 2 +- src/document/renderer.c | 2 +- src/ecmascript/ecmascript-c.cpp | 1 - src/ecmascript/ecmascript.cpp | 1 - src/{ecmascript => js}/Makefile | 0 src/{ecmascript => js}/css2xpath.cpp | 2 +- src/{ecmascript => js}/css2xpath.h | 0 src/{ecmascript => js}/ecmascript-c.c | 18 +++---- src/js/ecmascript-c.cpp | 1 + src/{ecmascript => js}/ecmascript-c.h | 2 +- src/{ecmascript => js}/ecmascript.c | 18 +++---- src/js/ecmascript.cpp | 1 + src/{ecmascript => js}/ecmascript.h | 0 src/{ecmascript => js}/fetch.js | 0 src/{ecmascript => js}/libdom/Makefile | 0 src/{ecmascript => js}/libdom/dom.h | 0 src/{ecmascript => js}/libdom/meson.build | 0 src/{ecmascript => js}/libdom/parse.c | 0 src/{ecmascript => js}/libdom/parse.h | 0 src/{ecmascript => js}/localstorage-db.c | 2 +- src/{ecmascript => js}/localstorage-db.h | 0 src/{ecmascript => js}/meson.build | 0 src/{ecmascript => js}/mujs.c | 42 +++++++-------- src/{ecmascript => js}/mujs.h | 0 src/{ecmascript => js}/mujs/Makefile | 0 src/{ecmascript => js}/mujs/attr.c | 8 +-- src/{ecmascript => js}/mujs/attr.h | 0 src/{ecmascript => js}/mujs/attributes.c | 10 ++-- src/{ecmascript => js}/mujs/attributes.h | 0 src/{ecmascript => js}/mujs/collection.c | 10 ++-- src/{ecmascript => js}/mujs/collection.h | 0 src/{ecmascript => js}/mujs/collection2.c | 12 ++--- src/{ecmascript => js}/mujs/console.c | 6 +-- src/{ecmascript => js}/mujs/console.h | 0 src/{ecmascript => js}/mujs/css.c | 10 ++-- src/{ecmascript => js}/mujs/css.h | 0 src/{ecmascript => js}/mujs/customevent.c | 10 ++-- src/{ecmascript => js}/mujs/customevent.h | 0 src/{ecmascript => js}/mujs/dataset.c | 12 ++--- src/{ecmascript => js}/mujs/dataset.h | 0 src/{ecmascript => js}/mujs/document.c | 38 +++++++------- src/{ecmascript => js}/mujs/document.h | 0 src/{ecmascript => js}/mujs/domparser.c | 10 ++-- src/{ecmascript => js}/mujs/domparser.h | 0 src/{ecmascript => js}/mujs/domrect.c | 8 +-- src/{ecmascript => js}/mujs/domrect.h | 0 src/{ecmascript => js}/mujs/element.c | 40 +++++++------- src/{ecmascript => js}/mujs/element.h | 0 src/{ecmascript => js}/mujs/event.c | 10 ++-- src/{ecmascript => js}/mujs/event.h | 0 src/{ecmascript => js}/mujs/form.c | 16 +++--- src/{ecmascript => js}/mujs/form.h | 0 src/{ecmascript => js}/mujs/forms.c | 16 +++--- src/{ecmascript => js}/mujs/forms.h | 0 src/{ecmascript => js}/mujs/fragment.c | 38 +++++++------- src/{ecmascript => js}/mujs/fragment.h | 0 src/{ecmascript => js}/mujs/history.c | 8 +-- src/{ecmascript => js}/mujs/history.h | 0 src/{ecmascript => js}/mujs/implementation.c | 10 ++-- src/{ecmascript => js}/mujs/implementation.h | 0 src/{ecmascript => js}/mujs/input.c | 16 +++--- src/{ecmascript => js}/mujs/input.h | 0 src/{ecmascript => js}/mujs/keyboard.c | 10 ++-- src/{ecmascript => js}/mujs/keyboard.h | 0 src/{ecmascript => js}/mujs/localstorage.c | 8 +-- src/{ecmascript => js}/mujs/localstorage.h | 0 src/{ecmascript => js}/mujs/location.c | 8 +-- src/{ecmascript => js}/mujs/location.h | 0 src/{ecmascript => js}/mujs/mapa.c | 6 +-- src/{ecmascript => js}/mujs/mapa.h | 0 src/{ecmascript => js}/mujs/meson.build | 0 src/{ecmascript => js}/mujs/message.c | 6 +-- src/{ecmascript => js}/mujs/message.h | 0 src/{ecmascript => js}/mujs/navigator.c | 6 +-- src/{ecmascript => js}/mujs/navigator.h | 0 src/{ecmascript => js}/mujs/node.c | 10 ++-- src/{ecmascript => js}/mujs/node.h | 0 src/{ecmascript => js}/mujs/nodelist.c | 12 ++--- src/{ecmascript => js}/mujs/nodelist.h | 0 src/{ecmascript => js}/mujs/nodelist2.c | 14 ++--- src/{ecmascript => js}/mujs/nodelist2.h | 0 src/{ecmascript => js}/mujs/screen.c | 8 +-- src/{ecmascript => js}/mujs/screen.h | 0 src/{ecmascript => js}/mujs/style.c | 8 +-- src/{ecmascript => js}/mujs/style.h | 0 src/{ecmascript => js}/mujs/text.c | 40 +++++++------- src/{ecmascript => js}/mujs/text.h | 0 src/{ecmascript => js}/mujs/tokenlist.c | 10 ++-- src/{ecmascript => js}/mujs/tokenlist.h | 0 src/{ecmascript => js}/mujs/unibar.c | 6 +-- src/{ecmascript => js}/mujs/unibar.h | 0 src/{ecmascript => js}/mujs/url.c | 6 +-- src/{ecmascript => js}/mujs/url.h | 0 src/{ecmascript => js}/mujs/window.c | 18 +++---- src/{ecmascript => js}/mujs/window.h | 0 src/{ecmascript => js}/mujs/xhr.c | 10 ++-- src/{ecmascript => js}/mujs/xhr.h | 0 src/{ecmascript => js}/quickjs.c | 52 +++++++++---------- src/{ecmascript => js}/quickjs.h | 0 src/{ecmascript => js}/quickjs/Makefile | 0 src/{ecmascript => js}/quickjs/attr.c | 6 +-- src/{ecmascript => js}/quickjs/attr.h | 0 src/{ecmascript => js}/quickjs/attributes.c | 10 ++-- src/{ecmascript => js}/quickjs/attributes.h | 0 src/{ecmascript => js}/quickjs/collection.c | 10 ++-- src/{ecmascript => js}/quickjs/collection.h | 0 src/{ecmascript => js}/quickjs/collection2.c | 12 ++--- src/{ecmascript => js}/quickjs/console.c | 6 +-- src/{ecmascript => js}/quickjs/console.h | 0 src/{ecmascript => js}/quickjs/css.c | 10 ++-- src/{ecmascript => js}/quickjs/css.h | 0 src/{ecmascript => js}/quickjs/customevent.c | 10 ++-- src/{ecmascript => js}/quickjs/customevent.h | 0 src/{ecmascript => js}/quickjs/dataset.c | 12 ++--- src/{ecmascript => js}/quickjs/dataset.h | 0 src/{ecmascript => js}/quickjs/document.c | 36 ++++++------- src/{ecmascript => js}/quickjs/document.h | 0 src/{ecmascript => js}/quickjs/domparser.c | 10 ++-- src/{ecmascript => js}/quickjs/domparser.h | 0 src/{ecmascript => js}/quickjs/domrect.c | 10 ++-- src/{ecmascript => js}/quickjs/domrect.h | 0 src/{ecmascript => js}/quickjs/element.c | 42 +++++++-------- src/{ecmascript => js}/quickjs/element.h | 0 src/{ecmascript => js}/quickjs/event.c | 10 ++-- src/{ecmascript => js}/quickjs/event.h | 0 src/{ecmascript => js}/quickjs/form.c | 16 +++--- src/{ecmascript => js}/quickjs/form.h | 0 src/{ecmascript => js}/quickjs/forms.c | 16 +++--- src/{ecmascript => js}/quickjs/forms.h | 0 src/{ecmascript => js}/quickjs/fragment.c | 38 +++++++------- src/{ecmascript => js}/quickjs/fragment.h | 0 src/{ecmascript => js}/quickjs/heartbeat.c | 6 +-- src/{ecmascript => js}/quickjs/heartbeat.h | 0 src/{ecmascript => js}/quickjs/history.c | 8 +-- src/{ecmascript => js}/quickjs/history.h | 0 .../quickjs/implementation.c | 10 ++-- .../quickjs/implementation.h | 0 src/{ecmascript => js}/quickjs/input.c | 16 +++--- src/{ecmascript => js}/quickjs/input.h | 0 src/{ecmascript => js}/quickjs/keyboard.c | 10 ++-- src/{ecmascript => js}/quickjs/keyboard.h | 0 src/{ecmascript => js}/quickjs/localstorage.c | 8 +-- src/{ecmascript => js}/quickjs/localstorage.h | 0 src/{ecmascript => js}/quickjs/location.c | 6 +-- src/{ecmascript => js}/quickjs/location.h | 0 src/{ecmascript => js}/quickjs/mapa.c | 6 +-- src/{ecmascript => js}/quickjs/mapa.h | 0 src/{ecmascript => js}/quickjs/meson.build | 0 src/{ecmascript => js}/quickjs/message.c | 6 +-- src/{ecmascript => js}/quickjs/message.h | 0 src/{ecmascript => js}/quickjs/navigator.c | 6 +-- src/{ecmascript => js}/quickjs/navigator.h | 0 src/{ecmascript => js}/quickjs/node.c | 10 ++-- src/{ecmascript => js}/quickjs/node.h | 0 src/{ecmascript => js}/quickjs/nodelist.c | 10 ++-- src/{ecmascript => js}/quickjs/nodelist.h | 0 src/{ecmascript => js}/quickjs/nodelist2.c | 16 +++--- src/{ecmascript => js}/quickjs/nodelist2.h | 0 src/{ecmascript => js}/quickjs/screen.c | 6 +-- src/{ecmascript => js}/quickjs/screen.h | 0 src/{ecmascript => js}/quickjs/style.c | 8 +-- src/{ecmascript => js}/quickjs/style.h | 0 src/{ecmascript => js}/quickjs/text.c | 38 +++++++------- src/{ecmascript => js}/quickjs/text.h | 0 src/{ecmascript => js}/quickjs/tokenlist.c | 10 ++-- src/{ecmascript => js}/quickjs/tokenlist.h | 0 src/{ecmascript => js}/quickjs/unibar.c | 6 +-- src/{ecmascript => js}/quickjs/unibar.h | 0 src/{ecmascript => js}/quickjs/url.c | 8 +-- src/{ecmascript => js}/quickjs/url.h | 0 .../quickjs/urlsearchparams.c | 10 ++-- .../quickjs/urlsearchparams.h | 0 src/{ecmascript => js}/quickjs/window.c | 20 +++---- src/{ecmascript => js}/quickjs/window.h | 0 src/{ecmascript => js}/quickjs/xhr.c | 10 ++-- src/{ecmascript => js}/quickjs/xhr.h | 0 .../spidermonkey-shared.cpp | 2 +- src/{ecmascript => js}/spidermonkey-shared.h | 0 src/{ecmascript => js}/spidermonkey.cpp | 48 ++++++++--------- src/{ecmascript => js}/spidermonkey.h | 0 src/{ecmascript => js}/spidermonkey/Makefile | 0 src/{ecmascript => js}/spidermonkey/attr.cpp | 8 +-- src/{ecmascript => js}/spidermonkey/attr.h | 2 +- .../spidermonkey/attributes.cpp | 10 ++-- .../spidermonkey/attributes.h | 2 +- .../spidermonkey/collection.cpp | 10 ++-- .../spidermonkey/collection.h | 2 +- .../spidermonkey/console.cpp | 6 +-- src/{ecmascript => js}/spidermonkey/console.h | 2 +- src/{ecmascript => js}/spidermonkey/css.cpp | 10 ++-- src/{ecmascript => js}/spidermonkey/css.h | 2 +- .../spidermonkey/customevent.cpp | 16 +++--- .../spidermonkey/customevent.h | 2 +- .../spidermonkey/dataset.cpp | 12 ++--- src/{ecmascript => js}/spidermonkey/dataset.h | 2 +- .../spidermonkey/document.cpp | 44 ++++++++-------- .../spidermonkey/document.h | 2 +- .../spidermonkey/domparser.cpp | 16 +++--- .../spidermonkey/domparser.h | 2 +- .../spidermonkey/domrect.cpp | 12 ++--- src/{ecmascript => js}/spidermonkey/domrect.h | 2 +- .../spidermonkey/element.cpp | 36 ++++++------- src/{ecmascript => js}/spidermonkey/element.h | 2 +- src/{ecmascript => js}/spidermonkey/event.cpp | 16 +++--- src/{ecmascript => js}/spidermonkey/event.h | 2 +- src/{ecmascript => js}/spidermonkey/form.cpp | 16 +++--- src/{ecmascript => js}/spidermonkey/form.h | 2 +- src/{ecmascript => js}/spidermonkey/forms.cpp | 16 +++--- src/{ecmascript => js}/spidermonkey/forms.h | 2 +- .../spidermonkey/fragment.cpp | 38 +++++++------- .../spidermonkey/fragment.h | 2 +- .../spidermonkey/heartbeat.cpp | 8 +-- .../spidermonkey/heartbeat.h | 4 +- .../spidermonkey/history.cpp | 6 +-- src/{ecmascript => js}/spidermonkey/history.h | 2 +- .../spidermonkey/implementation.cpp | 12 ++--- .../spidermonkey/implementation.h | 2 +- src/{ecmascript => js}/spidermonkey/input.cpp | 16 +++--- src/{ecmascript => js}/spidermonkey/input.h | 2 +- .../spidermonkey/keyboard.cpp | 16 +++--- .../spidermonkey/keyboard.h | 2 +- .../spidermonkey/localstorage.cpp | 16 +++--- .../spidermonkey/localstorage.h | 4 +- .../spidermonkey/location.cpp | 8 +-- .../spidermonkey/location.h | 2 +- .../spidermonkey/meson.build | 0 .../spidermonkey/message.cpp | 12 ++--- src/{ecmascript => js}/spidermonkey/message.h | 2 +- .../spidermonkey/navigator.cpp | 6 +-- .../spidermonkey/navigator.h | 2 +- src/{ecmascript => js}/spidermonkey/node.cpp | 12 ++--- src/{ecmascript => js}/spidermonkey/node.h | 2 +- .../spidermonkey/nodelist.cpp | 12 ++--- .../spidermonkey/nodelist.h | 2 +- .../spidermonkey/nodelist2.cpp | 14 ++--- .../spidermonkey/nodelist2.h | 2 +- .../spidermonkey/screen.cpp | 8 +-- src/{ecmascript => js}/spidermonkey/screen.h | 2 +- src/{ecmascript => js}/spidermonkey/style.cpp | 10 ++-- src/{ecmascript => js}/spidermonkey/style.h | 2 +- src/{ecmascript => js}/spidermonkey/text.cpp | 38 +++++++------- src/{ecmascript => js}/spidermonkey/text.h | 2 +- .../spidermonkey/tokenlist.cpp | 10 ++-- .../spidermonkey/tokenlist.h | 2 +- .../spidermonkey/unibar.cpp | 8 +-- src/{ecmascript => js}/spidermonkey/unibar.h | 2 +- src/{ecmascript => js}/spidermonkey/url.cpp | 12 ++--- src/{ecmascript => js}/spidermonkey/url.h | 2 +- .../spidermonkey/urlsearchparams.cpp | 12 ++--- .../spidermonkey/urlsearchparams.h | 2 +- src/{ecmascript => js}/spidermonkey/util.h | 2 +- .../spidermonkey/window.cpp | 20 +++---- src/{ecmascript => js}/spidermonkey/window.h | 2 +- src/{ecmascript => js}/spidermonkey/xhr.cpp | 12 ++--- src/{ecmascript => js}/spidermonkey/xhr.h | 2 +- src/{ecmascript => js}/timer.c | 2 +- src/{ecmascript => js}/timer.h | 0 src/main/module.c | 2 +- src/main/timer.c | 2 +- src/meson.build | 2 +- src/osdep/dos/dos.c | 2 +- src/protocol/protocol.c | 2 +- src/scripting/smjs/action_object.cpp | 2 +- src/scripting/smjs/bookmarks.cpp | 2 +- src/scripting/smjs/bookmarks.h | 2 +- src/scripting/smjs/cache_object.cpp | 2 +- src/scripting/smjs/core.cpp | 2 +- src/scripting/smjs/core.h | 2 +- src/scripting/smjs/elinks_object.cpp | 4 +- src/scripting/smjs/elinks_object.h | 2 +- src/scripting/smjs/global_object.cpp | 2 +- src/scripting/smjs/global_object.h | 2 +- src/scripting/smjs/globhist.cpp | 2 +- src/scripting/smjs/hooks.cpp | 2 +- src/scripting/smjs/keybinding.cpp | 2 +- src/scripting/smjs/keybinding.h | 2 +- src/scripting/smjs/load_uri.cpp | 2 +- src/scripting/smjs/session_object.cpp | 2 +- src/scripting/smjs/session_object.h | 2 +- src/scripting/smjs/terminal_object.cpp | 2 +- src/scripting/smjs/view_state_object.cpp | 2 +- src/viewer/action.c | 2 +- src/viewer/text/form.c | 2 +- src/viewer/text/link.c | 4 +- src/viewer/text/view.c | 4 +- src/viewer/text/vs.c | 2 +- 291 files changed, 922 insertions(+), 922 deletions(-) delete mode 100644 src/ecmascript/ecmascript-c.cpp delete mode 100644 src/ecmascript/ecmascript.cpp rename src/{ecmascript => js}/Makefile (100%) rename src/{ecmascript => js}/css2xpath.cpp (99%) rename src/{ecmascript => js}/css2xpath.h (100%) rename src/{ecmascript => js}/ecmascript-c.c (98%) create mode 100644 src/js/ecmascript-c.cpp rename src/{ecmascript => js}/ecmascript-c.h (98%) rename src/{ecmascript => js}/ecmascript.c (98%) create mode 100644 src/js/ecmascript.cpp rename src/{ecmascript => js}/ecmascript.h (100%) rename src/{ecmascript => js}/fetch.js (100%) rename src/{ecmascript => js}/libdom/Makefile (100%) rename src/{ecmascript => js}/libdom/dom.h (100%) rename src/{ecmascript => js}/libdom/meson.build (100%) rename src/{ecmascript => js}/libdom/parse.c (100%) rename src/{ecmascript => js}/libdom/parse.h (100%) rename src/{ecmascript => js}/localstorage-db.c (99%) rename src/{ecmascript => js}/localstorage-db.h (100%) rename src/{ecmascript => js}/meson.build (100%) rename src/{ecmascript => js}/mujs.c (92%) rename src/{ecmascript => js}/mujs.h (100%) rename src/{ecmascript => js}/mujs/Makefile (100%) rename src/{ecmascript => js}/mujs/attr.c (94%) rename src/{ecmascript => js}/mujs/attr.h (100%) rename src/{ecmascript => js}/mujs/attributes.c (96%) rename src/{ecmascript => js}/mujs/attributes.h (100%) rename src/{ecmascript => js}/mujs/collection.c (97%) rename src/{ecmascript => js}/mujs/collection.h (100%) rename src/{ecmascript => js}/mujs/collection2.c (96%) rename src/{ecmascript => js}/mujs/console.c (96%) rename src/{ecmascript => js}/mujs/console.h (100%) rename src/{ecmascript => js}/mujs/css.c (94%) rename src/{ecmascript => js}/mujs/css.h (100%) rename src/{ecmascript => js}/mujs/customevent.c (98%) rename src/{ecmascript => js}/mujs/customevent.h (100%) rename src/{ecmascript => js}/mujs/dataset.c (94%) rename src/{ecmascript => js}/mujs/dataset.h (100%) rename src/{ecmascript => js}/mujs/document.c (98%) rename src/{ecmascript => js}/mujs/document.h (100%) rename src/{ecmascript => js}/mujs/domparser.c (88%) rename src/{ecmascript => js}/mujs/domparser.h (100%) rename src/{ecmascript => js}/mujs/domrect.c (98%) rename src/{ecmascript => js}/mujs/domrect.h (100%) rename src/{ecmascript => js}/mujs/element.c (99%) rename src/{ecmascript => js}/mujs/element.h (100%) rename src/{ecmascript => js}/mujs/event.c (97%) rename src/{ecmascript => js}/mujs/event.h (100%) rename src/{ecmascript => js}/mujs/form.c (98%) rename src/{ecmascript => js}/mujs/form.h (100%) rename src/{ecmascript => js}/mujs/forms.c (93%) rename src/{ecmascript => js}/mujs/forms.h (100%) rename src/{ecmascript => js}/mujs/fragment.c (97%) rename src/{ecmascript => js}/mujs/fragment.h (100%) rename src/{ecmascript => js}/mujs/history.c (94%) rename src/{ecmascript => js}/mujs/history.h (100%) rename src/{ecmascript => js}/mujs/implementation.c (87%) rename src/{ecmascript => js}/mujs/implementation.h (100%) rename src/{ecmascript => js}/mujs/input.c (99%) rename src/{ecmascript => js}/mujs/input.h (100%) rename src/{ecmascript => js}/mujs/keyboard.c (98%) rename src/{ecmascript => js}/mujs/keyboard.h (100%) rename src/{ecmascript => js}/mujs/localstorage.c (95%) rename src/{ecmascript => js}/mujs/localstorage.h (100%) rename src/{ecmascript => js}/mujs/location.c (99%) rename src/{ecmascript => js}/mujs/location.h (100%) rename src/{ecmascript => js}/mujs/mapa.c (98%) rename src/{ecmascript => js}/mujs/mapa.h (100%) rename src/{ecmascript => js}/mujs/meson.build (100%) rename src/{ecmascript => js}/mujs/message.c (98%) rename src/{ecmascript => js}/mujs/message.h (100%) rename src/{ecmascript => js}/mujs/navigator.c (96%) rename src/{ecmascript => js}/mujs/navigator.h (100%) rename src/{ecmascript => js}/mujs/node.c (96%) rename src/{ecmascript => js}/mujs/node.h (100%) rename src/{ecmascript => js}/mujs/nodelist.c (93%) rename src/{ecmascript => js}/mujs/nodelist.h (100%) rename src/{ecmascript => js}/mujs/nodelist2.c (91%) rename src/{ecmascript => js}/mujs/nodelist2.h (100%) rename src/{ecmascript => js}/mujs/screen.c (96%) rename src/{ecmascript => js}/mujs/screen.h (100%) rename src/{ecmascript => js}/mujs/style.c (98%) rename src/{ecmascript => js}/mujs/style.h (100%) rename src/{ecmascript => js}/mujs/text.c (97%) rename src/{ecmascript => js}/mujs/text.h (100%) rename src/{ecmascript => js}/mujs/tokenlist.c (96%) rename src/{ecmascript => js}/mujs/tokenlist.h (100%) rename src/{ecmascript => js}/mujs/unibar.c (97%) rename src/{ecmascript => js}/mujs/unibar.h (100%) rename src/{ecmascript => js}/mujs/url.c (99%) rename src/{ecmascript => js}/mujs/url.h (100%) rename src/{ecmascript => js}/mujs/window.c (98%) rename src/{ecmascript => js}/mujs/window.h (100%) rename src/{ecmascript => js}/mujs/xhr.c (99%) rename src/{ecmascript => js}/mujs/xhr.h (100%) rename src/{ecmascript => js}/quickjs.c (92%) rename src/{ecmascript => js}/quickjs.h (100%) rename src/{ecmascript => js}/quickjs/Makefile (100%) rename src/{ecmascript => js}/quickjs/attr.c (97%) rename src/{ecmascript => js}/quickjs/attr.h (100%) rename src/{ecmascript => js}/quickjs/attributes.c (97%) rename src/{ecmascript => js}/quickjs/attributes.h (100%) rename src/{ecmascript => js}/quickjs/collection.c (97%) rename src/{ecmascript => js}/quickjs/collection.h (100%) rename src/{ecmascript => js}/quickjs/collection2.c (97%) rename src/{ecmascript => js}/quickjs/console.c (97%) rename src/{ecmascript => js}/quickjs/console.h (100%) rename src/{ecmascript => js}/quickjs/css.c (96%) rename src/{ecmascript => js}/quickjs/css.h (100%) rename src/{ecmascript => js}/quickjs/customevent.c (98%) rename src/{ecmascript => js}/quickjs/customevent.h (100%) rename src/{ecmascript => js}/quickjs/dataset.c (96%) rename src/{ecmascript => js}/quickjs/dataset.h (100%) rename src/{ecmascript => js}/quickjs/document.c (98%) rename src/{ecmascript => js}/quickjs/document.h (100%) rename src/{ecmascript => js}/quickjs/domparser.c (93%) rename src/{ecmascript => js}/quickjs/domparser.h (100%) rename src/{ecmascript => js}/quickjs/domrect.c (98%) rename src/{ecmascript => js}/quickjs/domrect.h (100%) rename src/{ecmascript => js}/quickjs/element.c (99%) rename src/{ecmascript => js}/quickjs/element.h (100%) rename src/{ecmascript => js}/quickjs/event.c (97%) rename src/{ecmascript => js}/quickjs/event.h (100%) rename src/{ecmascript => js}/quickjs/form.c (98%) rename src/{ecmascript => js}/quickjs/form.h (100%) rename src/{ecmascript => js}/quickjs/forms.c (95%) rename src/{ecmascript => js}/quickjs/forms.h (100%) rename src/{ecmascript => js}/quickjs/fragment.c (98%) rename src/{ecmascript => js}/quickjs/fragment.h (100%) rename src/{ecmascript => js}/quickjs/heartbeat.c (96%) rename src/{ecmascript => js}/quickjs/heartbeat.h (100%) rename src/{ecmascript => js}/quickjs/history.c (96%) rename src/{ecmascript => js}/quickjs/history.h (100%) rename src/{ecmascript => js}/quickjs/implementation.c (95%) rename src/{ecmascript => js}/quickjs/implementation.h (100%) rename src/{ecmascript => js}/quickjs/input.c (99%) rename src/{ecmascript => js}/quickjs/input.h (100%) rename src/{ecmascript => js}/quickjs/keyboard.c (98%) rename src/{ecmascript => js}/quickjs/keyboard.h (100%) rename src/{ecmascript => js}/quickjs/localstorage.c (97%) rename src/{ecmascript => js}/quickjs/localstorage.h (100%) rename src/{ecmascript => js}/quickjs/location.c (99%) rename src/{ecmascript => js}/quickjs/location.h (100%) rename src/{ecmascript => js}/quickjs/mapa.c (99%) rename src/{ecmascript => js}/quickjs/mapa.h (100%) rename src/{ecmascript => js}/quickjs/meson.build (100%) rename src/{ecmascript => js}/quickjs/message.c (99%) rename src/{ecmascript => js}/quickjs/message.h (100%) rename src/{ecmascript => js}/quickjs/navigator.c (97%) rename src/{ecmascript => js}/quickjs/navigator.h (100%) rename src/{ecmascript => js}/quickjs/node.c (94%) rename src/{ecmascript => js}/quickjs/node.h (100%) rename src/{ecmascript => js}/quickjs/nodelist.c (96%) rename src/{ecmascript => js}/quickjs/nodelist.h (100%) rename src/{ecmascript => js}/quickjs/nodelist2.c (91%) rename src/{ecmascript => js}/quickjs/nodelist2.h (100%) rename src/{ecmascript => js}/quickjs/screen.c (97%) rename src/{ecmascript => js}/quickjs/screen.h (100%) rename src/{ecmascript => js}/quickjs/style.c (99%) rename src/{ecmascript => js}/quickjs/style.h (100%) rename src/{ecmascript => js}/quickjs/text.c (98%) rename src/{ecmascript => js}/quickjs/text.h (100%) rename src/{ecmascript => js}/quickjs/tokenlist.c (96%) rename src/{ecmascript => js}/quickjs/tokenlist.h (100%) rename src/{ecmascript => js}/quickjs/unibar.c (97%) rename src/{ecmascript => js}/quickjs/unibar.h (100%) rename src/{ecmascript => js}/quickjs/url.c (99%) rename src/{ecmascript => js}/quickjs/url.h (100%) rename src/{ecmascript => js}/quickjs/urlsearchparams.c (98%) rename src/{ecmascript => js}/quickjs/urlsearchparams.h (100%) rename src/{ecmascript => js}/quickjs/window.c (98%) rename src/{ecmascript => js}/quickjs/window.h (100%) rename src/{ecmascript => js}/quickjs/xhr.c (99%) rename src/{ecmascript => js}/quickjs/xhr.h (100%) rename src/{ecmascript => js}/spidermonkey-shared.cpp (98%) rename src/{ecmascript => js}/spidermonkey-shared.h (100%) rename src/{ecmascript => js}/spidermonkey.cpp (94%) rename src/{ecmascript => js}/spidermonkey.h (100%) rename src/{ecmascript => js}/spidermonkey/Makefile (100%) rename src/{ecmascript => js}/spidermonkey/attr.cpp (97%) rename src/{ecmascript => js}/spidermonkey/attr.h (77%) rename src/{ecmascript => js}/spidermonkey/attributes.cpp (97%) rename src/{ecmascript => js}/spidermonkey/attributes.h (79%) rename src/{ecmascript => js}/spidermonkey/collection.cpp (98%) rename src/{ecmascript => js}/spidermonkey/collection.h (79%) rename src/{ecmascript => js}/spidermonkey/console.cpp (96%) rename src/{ecmascript => js}/spidermonkey/console.h (85%) rename src/{ecmascript => js}/spidermonkey/css.cpp (97%) rename src/{ecmascript => js}/spidermonkey/css.h (78%) rename src/{ecmascript => js}/spidermonkey/customevent.cpp (97%) rename src/{ecmascript => js}/spidermonkey/customevent.h (88%) rename src/{ecmascript => js}/spidermonkey/dataset.cpp (96%) rename src/{ecmascript => js}/spidermonkey/dataset.h (78%) rename src/{ecmascript => js}/spidermonkey/document.cpp (98%) rename src/{ecmascript => js}/spidermonkey/document.h (91%) rename src/{ecmascript => js}/spidermonkey/domparser.cpp (91%) rename src/{ecmascript => js}/spidermonkey/domparser.h (86%) rename src/{ecmascript => js}/spidermonkey/domrect.cpp (98%) rename src/{ecmascript => js}/spidermonkey/domrect.h (83%) rename src/{ecmascript => js}/spidermonkey/element.cpp (99%) rename src/{ecmascript => js}/spidermonkey/element.h (91%) rename src/{ecmascript => js}/spidermonkey/event.cpp (96%) rename src/{ecmascript => js}/spidermonkey/event.h (88%) rename src/{ecmascript => js}/spidermonkey/form.cpp (99%) rename src/{ecmascript => js}/spidermonkey/form.h (88%) rename src/{ecmascript => js}/spidermonkey/forms.cpp (96%) rename src/{ecmascript => js}/spidermonkey/forms.h (90%) rename src/{ecmascript => js}/spidermonkey/fragment.cpp (98%) rename src/{ecmascript => js}/spidermonkey/fragment.h (84%) rename src/{ecmascript => js}/spidermonkey/heartbeat.cpp (95%) rename src/{ecmascript => js}/spidermonkey/heartbeat.h (89%) rename src/{ecmascript => js}/spidermonkey/history.cpp (97%) rename src/{ecmascript => js}/spidermonkey/history.h (81%) rename src/{ecmascript => js}/spidermonkey/implementation.cpp (90%) rename src/{ecmascript => js}/spidermonkey/implementation.h (79%) rename src/{ecmascript => js}/spidermonkey/input.cpp (99%) rename src/{ecmascript => js}/spidermonkey/input.h (81%) rename src/{ecmascript => js}/spidermonkey/keyboard.cpp (97%) rename src/{ecmascript => js}/spidermonkey/keyboard.h (90%) rename src/{ecmascript => js}/spidermonkey/localstorage.cpp (94%) rename src/{ecmascript => js}/spidermonkey/localstorage.h (76%) rename src/{ecmascript => js}/spidermonkey/location.cpp (99%) rename src/{ecmascript => js}/spidermonkey/location.h (86%) rename src/{ecmascript => js}/spidermonkey/meson.build (100%) rename src/{ecmascript => js}/spidermonkey/message.cpp (98%) rename src/{ecmascript => js}/spidermonkey/message.h (90%) rename src/{ecmascript => js}/spidermonkey/navigator.cpp (97%) rename src/{ecmascript => js}/spidermonkey/navigator.h (81%) rename src/{ecmascript => js}/spidermonkey/node.cpp (95%) rename src/{ecmascript => js}/spidermonkey/node.h (84%) rename src/{ecmascript => js}/spidermonkey/nodelist.cpp (96%) rename src/{ecmascript => js}/spidermonkey/nodelist.h (78%) rename src/{ecmascript => js}/spidermonkey/nodelist2.cpp (94%) rename src/{ecmascript => js}/spidermonkey/nodelist2.h (79%) rename src/{ecmascript => js}/spidermonkey/screen.cpp (97%) rename src/{ecmascript => js}/spidermonkey/screen.h (80%) rename src/{ecmascript => js}/spidermonkey/style.cpp (99%) rename src/{ecmascript => js}/spidermonkey/style.h (77%) rename src/{ecmascript => js}/spidermonkey/text.cpp (98%) rename src/{ecmascript => js}/spidermonkey/text.h (83%) rename src/{ecmascript => js}/spidermonkey/tokenlist.cpp (97%) rename src/{ecmascript => js}/spidermonkey/tokenlist.h (79%) rename src/{ecmascript => js}/spidermonkey/unibar.cpp (97%) rename src/{ecmascript => js}/spidermonkey/unibar.h (82%) rename src/{ecmascript => js}/spidermonkey/url.cpp (99%) rename src/{ecmascript => js}/spidermonkey/url.h (86%) rename src/{ecmascript => js}/spidermonkey/urlsearchparams.cpp (98%) rename src/{ecmascript => js}/spidermonkey/urlsearchparams.h (89%) rename src/{ecmascript => js}/spidermonkey/util.h (96%) rename src/{ecmascript => js}/spidermonkey/window.cpp (98%) rename src/{ecmascript => js}/spidermonkey/window.h (84%) rename src/{ecmascript => js}/spidermonkey/xhr.cpp (99%) rename src/{ecmascript => js}/spidermonkey/xhr.h (88%) rename src/{ecmascript => js}/timer.c (97%) rename src/{ecmascript => js}/timer.h (100%) diff --git a/src/Makefile b/src/Makefile index fb2943c95..1994a783f 100644 --- a/src/Makefile +++ b/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 diff --git a/src/dialogs/info.c b/src/dialogs/info.c index 1ad517350..9a371ba85 100644 --- a/src/dialogs/info.c +++ b/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" diff --git a/src/document/document.c b/src/document/document.c index ef4ef0f2c..529974c9c 100644 --- a/src/document/document.c +++ b/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 diff --git a/src/document/libdom/doc.c b/src/document/libdom/doc.c index 650521560..fb6b6d98b 100644 --- a/src/document/libdom/doc.c +++ b/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" diff --git a/src/document/libdom/renderer.c b/src/document/libdom/renderer.c index f53a03cb0..744f09aac 100644 --- a/src/document/libdom/renderer.c +++ b/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) diff --git a/src/document/libdom/renderer2.c b/src/document/libdom/renderer2.c index bffcbfc29..0b1669226 100644 --- a/src/document/libdom/renderer2.c +++ b/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" diff --git a/src/document/renderer.c b/src/document/renderer.c index 46aa3d656..5c65957ee 100644 --- a/src/document/renderer.c +++ b/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" diff --git a/src/ecmascript/ecmascript-c.cpp b/src/ecmascript/ecmascript-c.cpp deleted file mode 100644 index 59def124e..000000000 --- a/src/ecmascript/ecmascript-c.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "ecmascript/ecmascript-c.c" diff --git a/src/ecmascript/ecmascript.cpp b/src/ecmascript/ecmascript.cpp deleted file mode 100644 index 2372dd1e5..000000000 --- a/src/ecmascript/ecmascript.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "ecmascript/ecmascript.c" diff --git a/src/ecmascript/Makefile b/src/js/Makefile similarity index 100% rename from src/ecmascript/Makefile rename to src/js/Makefile diff --git a/src/ecmascript/css2xpath.cpp b/src/js/css2xpath.cpp similarity index 99% rename from src/ecmascript/css2xpath.cpp rename to src/js/css2xpath.cpp index 1cbc95cba..401e96d36 100644 --- a/src/ecmascript/css2xpath.cpp +++ b/src/js/css2xpath.cpp @@ -15,7 +15,7 @@ #include #include -#include "ecmascript/css2xpath.h" +#include "js/css2xpath.h" namespace std { diff --git a/src/ecmascript/css2xpath.h b/src/js/css2xpath.h similarity index 100% rename from src/ecmascript/css2xpath.h rename to src/js/css2xpath.h diff --git a/src/ecmascript/ecmascript-c.c b/src/js/ecmascript-c.c similarity index 98% rename from src/ecmascript/ecmascript-c.c rename to src/js/ecmascript-c.c index 798af39be..4ba9c3d3b 100644 --- a/src/ecmascript/ecmascript-c.c +++ b/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 "ecmascript/ecmascript-c.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" #ifdef CONFIG_MUJS -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/element.h" +#include "js/mujs.h" +#include "js/mujs/element.h" #endif #ifdef CONFIG_QUICKJS -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" #endif #ifdef CONFIG_ECMASCRIPT_SMJS -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/element.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/element.h" #endif #include "intl/libintl.h" #include "protocol/uri.h" diff --git a/src/js/ecmascript-c.cpp b/src/js/ecmascript-c.cpp new file mode 100644 index 000000000..987d29cb3 --- /dev/null +++ b/src/js/ecmascript-c.cpp @@ -0,0 +1 @@ +#include "js/ecmascript-c.c" diff --git a/src/ecmascript/ecmascript-c.h b/src/js/ecmascript-c.h similarity index 98% rename from src/ecmascript/ecmascript-c.h rename to src/js/ecmascript-c.h index 92fdd643a..c8eefa87a 100644 --- a/src/ecmascript/ecmascript-c.h +++ b/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" diff --git a/src/ecmascript/ecmascript.c b/src/js/ecmascript.c similarity index 98% rename from src/ecmascript/ecmascript.c rename to src/js/ecmascript.c index cce889281..1a18bf9a4 100644 --- a/src/ecmascript/ecmascript.c +++ b/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 "ecmascript/ecmascript-c.h" -#include "ecmascript/libdom/parse.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.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 "ecmascript/quickjs/document.h" +#include "js/quickjs.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" diff --git a/src/js/ecmascript.cpp b/src/js/ecmascript.cpp new file mode 100644 index 000000000..586d98c9e --- /dev/null +++ b/src/js/ecmascript.cpp @@ -0,0 +1 @@ +#include "js/ecmascript.c" diff --git a/src/ecmascript/ecmascript.h b/src/js/ecmascript.h similarity index 100% rename from src/ecmascript/ecmascript.h rename to src/js/ecmascript.h diff --git a/src/ecmascript/fetch.js b/src/js/fetch.js similarity index 100% rename from src/ecmascript/fetch.js rename to src/js/fetch.js diff --git a/src/ecmascript/libdom/Makefile b/src/js/libdom/Makefile similarity index 100% rename from src/ecmascript/libdom/Makefile rename to src/js/libdom/Makefile diff --git a/src/ecmascript/libdom/dom.h b/src/js/libdom/dom.h similarity index 100% rename from src/ecmascript/libdom/dom.h rename to src/js/libdom/dom.h diff --git a/src/ecmascript/libdom/meson.build b/src/js/libdom/meson.build similarity index 100% rename from src/ecmascript/libdom/meson.build rename to src/js/libdom/meson.build diff --git a/src/ecmascript/libdom/parse.c b/src/js/libdom/parse.c similarity index 100% rename from src/ecmascript/libdom/parse.c rename to src/js/libdom/parse.c diff --git a/src/ecmascript/libdom/parse.h b/src/js/libdom/parse.h similarity index 100% rename from src/ecmascript/libdom/parse.h rename to src/js/libdom/parse.h diff --git a/src/ecmascript/localstorage-db.c b/src/js/localstorage-db.c similarity index 99% rename from src/ecmascript/localstorage-db.c rename to src/js/localstorage-db.c index 80a2cf299..cb000d794 100644 --- a/src/ecmascript/localstorage-db.c +++ b/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 diff --git a/src/ecmascript/localstorage-db.h b/src/js/localstorage-db.h similarity index 100% rename from src/ecmascript/localstorage-db.h rename to src/js/localstorage-db.h diff --git a/src/ecmascript/meson.build b/src/js/meson.build similarity index 100% rename from src/ecmascript/meson.build rename to src/js/meson.build diff --git a/src/ecmascript/mujs.c b/src/js/mujs.c similarity index 92% rename from src/ecmascript/mujs.c rename to src/js/mujs.c index 89ff17fab..0591667f1 100644 --- a/src/ecmascript/mujs.c +++ b/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 "ecmascript/mujs.h" -#include "ecmascript/mujs/console.h" -#include "ecmascript/mujs/customevent.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/domparser.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/event.h" -#include "ecmascript/mujs/history.h" -#include "ecmascript/mujs/keyboard.h" -#include "ecmascript/mujs/localstorage.h" -#include "ecmascript/mujs/location.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs/message.h" -#include "ecmascript/mujs/navigator.h" -#include "ecmascript/mujs/node.h" -#include "ecmascript/mujs/screen.h" -#include "ecmascript/mujs/unibar.h" -#include "ecmascript/mujs/url.h" -#include "ecmascript/mujs/window.h" -#include "ecmascript/mujs/xhr.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/console.h" +#include "js/mujs/customevent.h" +#include "js/mujs/document.h" +#include "js/mujs/domparser.h" +#include "js/mujs/element.h" +#include "js/mujs/event.h" +#include "js/mujs/history.h" +#include "js/mujs/keyboard.h" +#include "js/mujs/localstorage.h" +#include "js/mujs/location.h" +#include "js/mujs/mapa.h" +#include "js/mujs/message.h" +#include "js/mujs/navigator.h" +#include "js/mujs/node.h" +#include "js/mujs/screen.h" +#include "js/mujs/unibar.h" +#include "js/mujs/url.h" +#include "js/mujs/window.h" +#include "js/mujs/xhr.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/mujs.h b/src/js/mujs.h similarity index 100% rename from src/ecmascript/mujs.h rename to src/js/mujs.h diff --git a/src/ecmascript/mujs/Makefile b/src/js/mujs/Makefile similarity index 100% rename from src/ecmascript/mujs/Makefile rename to src/js/mujs/Makefile diff --git a/src/ecmascript/mujs/attr.c b/src/js/mujs/attr.c similarity index 94% rename from src/ecmascript/mujs/attr.c rename to src/js/mujs/attr.c index b40928c1e..b136a4b94 100644 --- a/src/ecmascript/mujs/attr.c +++ b/src/js/mujs/attr.c @@ -13,10 +13,10 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/attr.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/attr.h" static void mjs_attr_get_property_name(js_State *J) diff --git a/src/ecmascript/mujs/attr.h b/src/js/mujs/attr.h similarity index 100% rename from src/ecmascript/mujs/attr.h rename to src/js/mujs/attr.h diff --git a/src/ecmascript/mujs/attributes.c b/src/js/mujs/attributes.c similarity index 96% rename from src/ecmascript/mujs/attributes.c rename to src/js/mujs/attributes.c index e9be0e781..cc5a5cea8 100644 --- a/src/ecmascript/mujs/attributes.c +++ b/src/js/mujs/attributes.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/attr.h" -#include "ecmascript/mujs/attributes.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/attr.h" +#include "js/mujs/attributes.h" void *map_attributes; void *map_rev_attributes; diff --git a/src/ecmascript/mujs/attributes.h b/src/js/mujs/attributes.h similarity index 100% rename from src/ecmascript/mujs/attributes.h rename to src/js/mujs/attributes.h diff --git a/src/ecmascript/mujs/collection.c b/src/js/mujs/collection.c similarity index 97% rename from src/ecmascript/mujs/collection.c rename to src/js/mujs/collection.c index bf8a2b57c..b635368f2 100644 --- a/src/ecmascript/mujs/collection.c +++ b/src/js/mujs/collection.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/collection.h" -#include "ecmascript/mujs/element.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/collection.h" +#include "js/mujs/element.h" void *map_collections; void *map_rev_collections; diff --git a/src/ecmascript/mujs/collection.h b/src/js/mujs/collection.h similarity index 100% rename from src/ecmascript/mujs/collection.h rename to src/js/mujs/collection.h diff --git a/src/ecmascript/mujs/collection2.c b/src/js/mujs/collection2.c similarity index 96% rename from src/ecmascript/mujs/collection2.c rename to src/js/mujs/collection2.c index 0772a135b..b151d251b 100644 --- a/src/ecmascript/mujs/collection2.c +++ b/src/js/mujs/collection2.c @@ -16,12 +16,12 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/collection.h" -#include "ecmascript/mujs/element.h" +#include "js/ecmascript-c.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/collection.h" +#include "js/mujs/element.h" static void mjs_htmlCollection2_get_property_length(js_State *J) diff --git a/src/ecmascript/mujs/console.c b/src/js/mujs/console.c similarity index 96% rename from src/ecmascript/mujs/console.c rename to src/js/mujs/console.c index 3f72c35e3..af35c141b 100644 --- a/src/ecmascript/mujs/console.c +++ b/src/js/mujs/console.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/console.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/console.h" #include "main/main.h" #define DEBUG 0 diff --git a/src/ecmascript/mujs/console.h b/src/js/mujs/console.h similarity index 100% rename from src/ecmascript/mujs/console.h rename to src/js/mujs/console.h diff --git a/src/ecmascript/mujs/css.c b/src/js/mujs/css.c similarity index 94% rename from src/ecmascript/mujs/css.c rename to src/js/mujs/css.c index b5fbc5ae8..7c62c8d81 100644 --- a/src/ecmascript/mujs/css.c +++ b/src/js/mujs/css.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/css.h" -#include "ecmascript/mujs/element.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/css.h" +#include "js/mujs/element.h" static void mjs_CSSStyleDeclaration_get_property_length(js_State *J) diff --git a/src/ecmascript/mujs/css.h b/src/js/mujs/css.h similarity index 100% rename from src/ecmascript/mujs/css.h rename to src/js/mujs/css.h diff --git a/src/ecmascript/mujs/customevent.c b/src/js/mujs/customevent.c similarity index 98% rename from src/ecmascript/mujs/customevent.c rename to src/js/mujs/customevent.c index 46d83ab19..57b3aecf3 100644 --- a/src/ecmascript/mujs/customevent.c +++ b/src/js/mujs/customevent.c @@ -12,11 +12,11 @@ #include "document/document.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/customevent.h" -#include "ecmascript/mujs/element.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/mujs.h" +#include "js/mujs/customevent.h" +#include "js/mujs/element.h" #include "intl/charsets.h" #include "terminal/event.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/mujs/customevent.h b/src/js/mujs/customevent.h similarity index 100% rename from src/ecmascript/mujs/customevent.h rename to src/js/mujs/customevent.h diff --git a/src/ecmascript/mujs/dataset.c b/src/js/mujs/dataset.c similarity index 94% rename from src/ecmascript/mujs/dataset.c rename to src/js/mujs/dataset.c index f212c8a14..4b1615966 100644 --- a/src/ecmascript/mujs/dataset.c +++ b/src/js/mujs/dataset.c @@ -16,12 +16,12 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/dataset.h" -#include "ecmascript/mujs/element.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/dataset.h" +#include "js/mujs/element.h" static void mjs_dataset_finalizer(js_State *J, void *node) diff --git a/src/ecmascript/mujs/dataset.h b/src/js/mujs/dataset.h similarity index 100% rename from src/ecmascript/mujs/dataset.h rename to src/js/mujs/dataset.h diff --git a/src/ecmascript/mujs/document.c b/src/js/mujs/document.c similarity index 98% rename from src/ecmascript/mujs/document.c rename to src/js/mujs/document.c index 1333d6349..d4a27aaf5 100644 --- a/src/ecmascript/mujs/document.c +++ b/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 "ecmascript/ecmascript-c.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/libdom/parse.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/collection.h" -#include "ecmascript/mujs/event.h" -#include "ecmascript/mujs/form.h" -#include "ecmascript/mujs/forms.h" -#include "ecmascript/mujs/fragment.h" -#include "ecmascript/mujs/implementation.h" -#include "ecmascript/mujs/location.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/nodelist.h" -#include "ecmascript/mujs/nodelist2.h" -#include "ecmascript/mujs/text.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/mujs/mapa.h" +#include "js/libdom/parse.h" +#include "js/mujs.h" +#include "js/mujs/collection.h" +#include "js/mujs/event.h" +#include "js/mujs/form.h" +#include "js/mujs/forms.h" +#include "js/mujs/fragment.h" +#include "js/mujs/implementation.h" +#include "js/mujs/location.h" +#include "js/mujs/document.h" +#include "js/mujs/element.h" +#include "js/mujs/nodelist.h" +#include "js/mujs/nodelist2.h" +#include "js/mujs/text.h" +#include "js/mujs/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/mujs/document.h b/src/js/mujs/document.h similarity index 100% rename from src/ecmascript/mujs/document.h rename to src/js/mujs/document.h diff --git a/src/ecmascript/mujs/domparser.c b/src/js/mujs/domparser.c similarity index 88% rename from src/ecmascript/mujs/domparser.c rename to src/js/mujs/domparser.c index 861c28231..256ef543f 100644 --- a/src/ecmascript/mujs/domparser.c +++ b/src/js/mujs/domparser.c @@ -11,11 +11,11 @@ #include "elinks.h" #include "document/libdom/doc.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/domparser.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/mujs.h" +#include "js/mujs/document.h" +#include "js/mujs/domparser.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/mujs/domparser.h b/src/js/mujs/domparser.h similarity index 100% rename from src/ecmascript/mujs/domparser.h rename to src/js/mujs/domparser.h diff --git a/src/ecmascript/mujs/domrect.c b/src/js/mujs/domrect.c similarity index 98% rename from src/ecmascript/mujs/domrect.c rename to src/js/mujs/domrect.c index 7410eee9b..f26c79e9f 100644 --- a/src/ecmascript/mujs/domrect.c +++ b/src/js/mujs/domrect.c @@ -10,10 +10,10 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/domrect.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/mujs.h" +#include "js/mujs/domrect.h" struct eljs_domrect { double x; diff --git a/src/ecmascript/mujs/domrect.h b/src/js/mujs/domrect.h similarity index 100% rename from src/ecmascript/mujs/domrect.h rename to src/js/mujs/domrect.h diff --git a/src/ecmascript/mujs/element.c b/src/js/mujs/element.c similarity index 99% rename from src/ecmascript/mujs/element.c rename to src/js/mujs/element.c index 7e12286a8..9d2e6fad2 100644 --- a/src/ecmascript/mujs/element.c +++ b/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 "ecmascript/ecmascript-c.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/attr.h" -#include "ecmascript/mujs/attributes.h" -#include "ecmascript/mujs/collection.h" -#include "ecmascript/mujs/dataset.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/domrect.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/event.h" -#include "ecmascript/mujs/fragment.h" -#include "ecmascript/mujs/keyboard.h" -#include "ecmascript/mujs/nodelist.h" -#include "ecmascript/mujs/nodelist2.h" -#include "ecmascript/mujs/style.h" -#include "ecmascript/mujs/text.h" -#include "ecmascript/mujs/tokenlist.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/attr.h" +#include "js/mujs/attributes.h" +#include "js/mujs/collection.h" +#include "js/mujs/dataset.h" +#include "js/mujs/document.h" +#include "js/mujs/domrect.h" +#include "js/mujs/element.h" +#include "js/mujs/event.h" +#include "js/mujs/fragment.h" +#include "js/mujs/keyboard.h" +#include "js/mujs/nodelist.h" +#include "js/mujs/nodelist2.h" +#include "js/mujs/style.h" +#include "js/mujs/text.h" +#include "js/mujs/tokenlist.h" +#include "js/mujs/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/mujs/element.h b/src/js/mujs/element.h similarity index 100% rename from src/ecmascript/mujs/element.h rename to src/js/mujs/element.h diff --git a/src/ecmascript/mujs/event.c b/src/js/mujs/event.c similarity index 97% rename from src/ecmascript/mujs/event.c rename to src/js/mujs/event.c index 2aebfb5ae..63e33ff61 100644 --- a/src/ecmascript/mujs/event.c +++ b/src/js/mujs/event.c @@ -10,11 +10,11 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/event.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/mujs.h" +#include "js/mujs/element.h" +#include "js/mujs/event.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/mujs/event.h b/src/js/mujs/event.h similarity index 100% rename from src/ecmascript/mujs/event.h rename to src/js/mujs/event.h diff --git a/src/ecmascript/mujs/form.c b/src/js/mujs/form.c similarity index 98% rename from src/ecmascript/mujs/form.c rename to src/js/mujs/form.c index 4dd791f2c..1b5e06cba 100644 --- a/src/ecmascript/mujs/form.c +++ b/src/js/mujs/form.c @@ -17,14 +17,14 @@ #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/form.h" -#include "ecmascript/mujs/forms.h" -#include "ecmascript/mujs/input.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/document.h" +#include "js/mujs/form.h" +#include "js/mujs/forms.h" +#include "js/mujs/input.h" +#include "js/mujs/window.h" #include "session/session.h" #include "viewer/text/form.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/mujs/form.h b/src/js/mujs/form.h similarity index 100% rename from src/ecmascript/mujs/form.h rename to src/js/mujs/form.h diff --git a/src/ecmascript/mujs/forms.c b/src/js/mujs/forms.c similarity index 93% rename from src/ecmascript/mujs/forms.c rename to src/js/mujs/forms.c index 4f4c555c1..c7818c2e7 100644 --- a/src/ecmascript/mujs/forms.c +++ b/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 "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/form.h" -#include "ecmascript/mujs/forms.h" -#include "ecmascript/mujs/input.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/document.h" +#include "js/mujs/form.h" +#include "js/mujs/forms.h" +#include "js/mujs/input.h" +#include "js/mujs/window.h" #include "viewer/text/form.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/mujs/forms.h b/src/js/mujs/forms.h similarity index 100% rename from src/ecmascript/mujs/forms.h rename to src/js/mujs/forms.h diff --git a/src/ecmascript/mujs/fragment.c b/src/js/mujs/fragment.c similarity index 97% rename from src/ecmascript/mujs/fragment.c rename to src/js/mujs/fragment.c index 4790027ee..abc324456 100644 --- a/src/ecmascript/mujs/fragment.c +++ b/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 "ecmascript/ecmascript-c.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/attr.h" -#include "ecmascript/mujs/attributes.h" -#include "ecmascript/mujs/collection.h" -#include "ecmascript/mujs/dataset.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/domrect.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/event.h" -#include "ecmascript/mujs/fragment.h" -#include "ecmascript/mujs/keyboard.h" -#include "ecmascript/mujs/nodelist.h" -#include "ecmascript/mujs/nodelist2.h" -#include "ecmascript/mujs/style.h" -#include "ecmascript/mujs/tokenlist.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/attr.h" +#include "js/mujs/attributes.h" +#include "js/mujs/collection.h" +#include "js/mujs/dataset.h" +#include "js/mujs/document.h" +#include "js/mujs/domrect.h" +#include "js/mujs/element.h" +#include "js/mujs/event.h" +#include "js/mujs/fragment.h" +#include "js/mujs/keyboard.h" +#include "js/mujs/nodelist.h" +#include "js/mujs/nodelist2.h" +#include "js/mujs/style.h" +#include "js/mujs/tokenlist.h" +#include "js/mujs/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/mujs/fragment.h b/src/js/mujs/fragment.h similarity index 100% rename from src/ecmascript/mujs/fragment.h rename to src/js/mujs/fragment.h diff --git a/src/ecmascript/mujs/history.c b/src/js/mujs/history.c similarity index 94% rename from src/ecmascript/mujs/history.c rename to src/js/mujs/history.c index 9af9e1be8..9dd264b33 100644 --- a/src/ecmascript/mujs/history.c +++ b/src/js/mujs/history.c @@ -11,10 +11,10 @@ #include "elinks.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/history.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/history.h" +#include "js/mujs/window.h" #include "session/history.h" #include "session/location.h" #include "session/session.h" diff --git a/src/ecmascript/mujs/history.h b/src/js/mujs/history.h similarity index 100% rename from src/ecmascript/mujs/history.h rename to src/js/mujs/history.h diff --git a/src/ecmascript/mujs/implementation.c b/src/js/mujs/implementation.c similarity index 87% rename from src/ecmascript/mujs/implementation.c rename to src/js/mujs/implementation.c index af1c7de1c..724f3ff39 100644 --- a/src/ecmascript/mujs/implementation.c +++ b/src/js/mujs/implementation.c @@ -11,11 +11,11 @@ #include "elinks.h" #include "document/libdom/doc.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/parse.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/implementation.h" +#include "js/ecmascript.h" +#include "js/libdom/parse.h" +#include "js/mujs.h" +#include "js/mujs/document.h" +#include "js/mujs/implementation.h" #include "util/conv.h" static void diff --git a/src/ecmascript/mujs/implementation.h b/src/js/mujs/implementation.h similarity index 100% rename from src/ecmascript/mujs/implementation.h rename to src/js/mujs/implementation.h diff --git a/src/ecmascript/mujs/input.c b/src/js/mujs/input.c similarity index 99% rename from src/ecmascript/mujs/input.c rename to src/js/mujs/input.c index 17f221df8..22cb3d40a 100644 --- a/src/ecmascript/mujs/input.c +++ b/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 "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/form.h" -#include "ecmascript/mujs/forms.h" -#include "ecmascript/mujs/input.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/document.h" +#include "js/mujs/form.h" +#include "js/mujs/forms.h" +#include "js/mujs/input.h" +#include "js/mujs/window.h" #include "intl/charsets.h" #include "viewer/text/draw.h" #include "viewer/text/form.h" diff --git a/src/ecmascript/mujs/input.h b/src/js/mujs/input.h similarity index 100% rename from src/ecmascript/mujs/input.h rename to src/js/mujs/input.h diff --git a/src/ecmascript/mujs/keyboard.c b/src/js/mujs/keyboard.c similarity index 98% rename from src/ecmascript/mujs/keyboard.c rename to src/js/mujs/keyboard.c index 4e4497893..6658fd48e 100644 --- a/src/ecmascript/mujs/keyboard.c +++ b/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 "ecmascript/mujs.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/keyboard.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/element.h" +#include "js/mujs/keyboard.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/mujs/keyboard.h b/src/js/mujs/keyboard.h similarity index 100% rename from src/ecmascript/mujs/keyboard.h rename to src/js/mujs/keyboard.h diff --git a/src/ecmascript/mujs/localstorage.c b/src/js/mujs/localstorage.c similarity index 95% rename from src/ecmascript/mujs/localstorage.c rename to src/js/mujs/localstorage.c index 28bf67d22..94c4350a9 100644 --- a/src/ecmascript/mujs/localstorage.c +++ b/src/js/mujs/localstorage.c @@ -12,10 +12,10 @@ #include "bfu/leds.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/localstorage-db.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/localstorage.h" +#include "js/ecmascript.h" +#include "js/localstorage-db.h" +#include "js/mujs.h" +#include "js/mujs/localstorage.h" #include "session/session.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/mujs/localstorage.h b/src/js/mujs/localstorage.h similarity index 100% rename from src/ecmascript/mujs/localstorage.h rename to src/js/mujs/localstorage.h diff --git a/src/ecmascript/mujs/location.c b/src/js/mujs/location.c similarity index 99% rename from src/ecmascript/mujs/location.c rename to src/js/mujs/location.c index de9912991..355dac248 100644 --- a/src/ecmascript/mujs/location.c +++ b/src/js/mujs/location.c @@ -12,10 +12,10 @@ #include "document/document.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/location.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/location.h" +#include "js/mujs/window.h" #include "protocol/uri.h" #include "session/history.h" #include "session/location.h" diff --git a/src/ecmascript/mujs/location.h b/src/js/mujs/location.h similarity index 100% rename from src/ecmascript/mujs/location.h rename to src/js/mujs/location.h diff --git a/src/ecmascript/mujs/mapa.c b/src/js/mujs/mapa.c similarity index 98% rename from src/ecmascript/mujs/mapa.c rename to src/js/mujs/mapa.c index 761f229b0..7fe70f413 100644 --- a/src/ecmascript/mujs/mapa.c +++ b/src/js/mujs/mapa.c @@ -9,9 +9,9 @@ #include #include -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs/xhr.h" +#include "js/mujs.h" +#include "js/mujs/mapa.h" +#include "js/mujs/xhr.h" #include "util/hash.h" #include "util/memory.h" #include "util/string.h" diff --git a/src/ecmascript/mujs/mapa.h b/src/js/mujs/mapa.h similarity index 100% rename from src/ecmascript/mujs/mapa.h rename to src/js/mujs/mapa.h diff --git a/src/ecmascript/mujs/meson.build b/src/js/mujs/meson.build similarity index 100% rename from src/ecmascript/mujs/meson.build rename to src/js/mujs/meson.build diff --git a/src/ecmascript/mujs/message.c b/src/js/mujs/message.c similarity index 98% rename from src/ecmascript/mujs/message.c rename to src/js/mujs/message.c index 900ea02d6..9476fa9fc 100644 --- a/src/ecmascript/mujs/message.c +++ b/src/js/mujs/message.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/message.h" +#include "js/ecmascript.h" +#include "js/mujs.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); diff --git a/src/ecmascript/mujs/message.h b/src/js/mujs/message.h similarity index 100% rename from src/ecmascript/mujs/message.h rename to src/js/mujs/message.h diff --git a/src/ecmascript/mujs/navigator.c b/src/js/mujs/navigator.c similarity index 96% rename from src/ecmascript/mujs/navigator.c rename to src/js/mujs/navigator.c index 65d70e853..8d48e54c2 100644 --- a/src/ecmascript/mujs/navigator.c +++ b/src/js/mujs/navigator.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/navigator.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/navigator.h" #include "intl/libintl.h" #include "osdep/sysname.h" #include "protocol/http/http.h" diff --git a/src/ecmascript/mujs/navigator.h b/src/js/mujs/navigator.h similarity index 100% rename from src/ecmascript/mujs/navigator.h rename to src/js/mujs/navigator.h diff --git a/src/ecmascript/mujs/node.c b/src/js/mujs/node.c similarity index 96% rename from src/ecmascript/mujs/node.c rename to src/js/mujs/node.c index 6478d82c9..f7c5dbf78 100644 --- a/src/ecmascript/mujs/node.c +++ b/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 "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/node.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/node.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/mujs/node.h b/src/js/mujs/node.h similarity index 100% rename from src/ecmascript/mujs/node.h rename to src/js/mujs/node.h diff --git a/src/ecmascript/mujs/nodelist.c b/src/js/mujs/nodelist.c similarity index 93% rename from src/ecmascript/mujs/nodelist.c rename to src/js/mujs/nodelist.c index d07f6e9b9..a674ff286 100644 --- a/src/ecmascript/mujs/nodelist.c +++ b/src/js/mujs/nodelist.c @@ -15,12 +15,12 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/nodelist.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/element.h" +#include "js/mujs/nodelist.h" +#include "js/mujs/window.h" //void *map_nodelist; //void *map_rev_nodelist; diff --git a/src/ecmascript/mujs/nodelist.h b/src/js/mujs/nodelist.h similarity index 100% rename from src/ecmascript/mujs/nodelist.h rename to src/js/mujs/nodelist.h diff --git a/src/ecmascript/mujs/nodelist2.c b/src/js/mujs/nodelist2.c similarity index 91% rename from src/ecmascript/mujs/nodelist2.c rename to src/js/mujs/nodelist2.c index 988559d19..6da075072 100644 --- a/src/ecmascript/mujs/nodelist2.c +++ b/src/js/mujs/nodelist2.c @@ -10,13 +10,13 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/nodelist2.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/element.h" +#include "js/mujs/nodelist2.h" +#include "js/mujs/window.h" void *map_nodelist2; void *map_rev_nodelist2; diff --git a/src/ecmascript/mujs/nodelist2.h b/src/js/mujs/nodelist2.h similarity index 100% rename from src/ecmascript/mujs/nodelist2.h rename to src/js/mujs/nodelist2.h diff --git a/src/ecmascript/mujs/screen.c b/src/js/mujs/screen.c similarity index 96% rename from src/ecmascript/mujs/screen.c rename to src/js/mujs/screen.c index f9167f059..71c0a413f 100644 --- a/src/ecmascript/mujs/screen.c +++ b/src/js/mujs/screen.c @@ -11,10 +11,10 @@ #include "elinks.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/screen.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/screen.h" +#include "js/mujs/window.h" #include "session/session.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/mujs/screen.h b/src/js/mujs/screen.h similarity index 100% rename from src/ecmascript/mujs/screen.h rename to src/js/mujs/screen.h diff --git a/src/ecmascript/mujs/style.c b/src/js/mujs/style.c similarity index 98% rename from src/ecmascript/mujs/style.c rename to src/js/mujs/style.c index 7144f3924..68cb8a99f 100644 --- a/src/ecmascript/mujs/style.c +++ b/src/js/mujs/style.c @@ -14,10 +14,10 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/style.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/style.h" static void mjs_style(js_State *J, const char *property) diff --git a/src/ecmascript/mujs/style.h b/src/js/mujs/style.h similarity index 100% rename from src/ecmascript/mujs/style.h rename to src/js/mujs/style.h diff --git a/src/ecmascript/mujs/text.c b/src/js/mujs/text.c similarity index 97% rename from src/ecmascript/mujs/text.c rename to src/js/mujs/text.c index 8399b1d28..08b6de9db 100644 --- a/src/ecmascript/mujs/text.c +++ b/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 "ecmascript/ecmascript-c.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/attr.h" -#include "ecmascript/mujs/attributes.h" -#include "ecmascript/mujs/collection.h" -#include "ecmascript/mujs/dataset.h" -#include "ecmascript/mujs/document.h" -#include "ecmascript/mujs/domrect.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/event.h" -#include "ecmascript/mujs/fragment.h" -#include "ecmascript/mujs/keyboard.h" -#include "ecmascript/mujs/nodelist.h" -#include "ecmascript/mujs/nodelist2.h" -#include "ecmascript/mujs/style.h" -#include "ecmascript/mujs/text.h" -#include "ecmascript/mujs/tokenlist.h" -#include "ecmascript/mujs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/attr.h" +#include "js/mujs/attributes.h" +#include "js/mujs/collection.h" +#include "js/mujs/dataset.h" +#include "js/mujs/document.h" +#include "js/mujs/domrect.h" +#include "js/mujs/element.h" +#include "js/mujs/event.h" +#include "js/mujs/fragment.h" +#include "js/mujs/keyboard.h" +#include "js/mujs/nodelist.h" +#include "js/mujs/nodelist2.h" +#include "js/mujs/style.h" +#include "js/mujs/text.h" +#include "js/mujs/tokenlist.h" +#include "js/mujs/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/mujs/text.h b/src/js/mujs/text.h similarity index 100% rename from src/ecmascript/mujs/text.h rename to src/js/mujs/text.h diff --git a/src/ecmascript/mujs/tokenlist.c b/src/js/mujs/tokenlist.c similarity index 96% rename from src/ecmascript/mujs/tokenlist.c rename to src/js/mujs/tokenlist.c index 6313d7d9a..9fb27aa2f 100644 --- a/src/ecmascript/mujs/tokenlist.c +++ b/src/js/mujs/tokenlist.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/tokenlist.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/element.h" +#include "js/mujs/tokenlist.h" static void mjs_tokenlist_add(js_State *J) diff --git a/src/ecmascript/mujs/tokenlist.h b/src/js/mujs/tokenlist.h similarity index 100% rename from src/ecmascript/mujs/tokenlist.h rename to src/js/mujs/tokenlist.h diff --git a/src/ecmascript/mujs/unibar.c b/src/js/mujs/unibar.c similarity index 97% rename from src/ecmascript/mujs/unibar.c rename to src/js/mujs/unibar.c index 416b329da..07be51d37 100644 --- a/src/ecmascript/mujs/unibar.c +++ b/src/js/mujs/unibar.c @@ -12,9 +12,9 @@ #include "dialogs/status.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/unibar.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/unibar.h" #include "main/select.h" #include "session/session.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/mujs/unibar.h b/src/js/mujs/unibar.h similarity index 100% rename from src/ecmascript/mujs/unibar.h rename to src/js/mujs/unibar.h diff --git a/src/ecmascript/mujs/url.c b/src/js/mujs/url.c similarity index 99% rename from src/ecmascript/mujs/url.c rename to src/js/mujs/url.c index 44647880c..2a8620d4a 100644 --- a/src/ecmascript/mujs/url.c +++ b/src/js/mujs/url.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/url.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/url.h" #include "protocol/uri.h" struct eljs_url { diff --git a/src/ecmascript/mujs/url.h b/src/js/mujs/url.h similarity index 100% rename from src/ecmascript/mujs/url.h rename to src/js/mujs/url.h diff --git a/src/ecmascript/mujs/window.c b/src/js/mujs/window.c similarity index 98% rename from src/ecmascript/mujs/window.c rename to src/js/mujs/window.c index 765687c96..0ac98a396 100644 --- a/src/ecmascript/mujs/window.c +++ b/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 "ecmascript/mujs.h" -#include "ecmascript/mujs/css.h" -#include "ecmascript/mujs/element.h" -#include "ecmascript/mujs/keyboard.h" -#include "ecmascript/mujs/location.h" -#include "ecmascript/mujs/message.h" -#include "ecmascript/mujs/window.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/mujs.h" +#include "js/mujs/css.h" +#include "js/mujs/element.h" +#include "js/mujs/keyboard.h" +#include "js/mujs/location.h" +#include "js/mujs/message.h" +#include "js/mujs/window.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/mujs/window.h b/src/js/mujs/window.h similarity index 100% rename from src/ecmascript/mujs/window.h rename to src/js/mujs/window.h diff --git a/src/ecmascript/mujs/xhr.c b/src/js/mujs/xhr.c similarity index 99% rename from src/ecmascript/mujs/xhr.c rename to src/js/mujs/xhr.c index 21cacbae0..03f1f5f39 100644 --- a/src/ecmascript/mujs/xhr.c +++ b/src/js/mujs/xhr.c @@ -21,11 +21,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/mujs/mapa.h" -#include "ecmascript/mujs.h" -#include "ecmascript/mujs/xhr.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/mujs/mapa.h" +#include "js/mujs.h" +#include "js/mujs/xhr.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/mujs/xhr.h b/src/js/mujs/xhr.h similarity index 100% rename from src/ecmascript/mujs/xhr.h rename to src/js/mujs/xhr.h diff --git a/src/ecmascript/quickjs.c b/src/js/quickjs.c similarity index 92% rename from src/ecmascript/quickjs.c rename to src/js/quickjs.c index 23f262fd6..f16a0fea1 100644 --- a/src/ecmascript/quickjs.c +++ b/src/js/quickjs.c @@ -23,31 +23,31 @@ #include "document/forms.h" #include "document/renderer.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/console.h" -#include "ecmascript/quickjs/customevent.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/domparser.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" -#include "ecmascript/quickjs/fragment.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/history.h" -#include "ecmascript/quickjs/keyboard.h" -#include "ecmascript/quickjs/localstorage.h" -#include "ecmascript/quickjs/location.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs/message.h" -#include "ecmascript/quickjs/navigator.h" -#include "ecmascript/quickjs/node.h" -#include "ecmascript/quickjs/screen.h" -#include "ecmascript/quickjs/text.h" -#include "ecmascript/quickjs/unibar.h" -#include "ecmascript/quickjs/url.h" -#include "ecmascript/quickjs/urlsearchparams.h" -#include "ecmascript/quickjs/window.h" -#include "ecmascript/quickjs/xhr.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/console.h" +#include "js/quickjs/customevent.h" +#include "js/quickjs/document.h" +#include "js/quickjs/domparser.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" +#include "js/quickjs/fragment.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/history.h" +#include "js/quickjs/keyboard.h" +#include "js/quickjs/localstorage.h" +#include "js/quickjs/location.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs/message.h" +#include "js/quickjs/navigator.h" +#include "js/quickjs/node.h" +#include "js/quickjs/screen.h" +#include "js/quickjs/text.h" +#include "js/quickjs/unibar.h" +#include "js/quickjs/url.h" +#include "js/quickjs/urlsearchparams.h" +#include "js/quickjs/window.h" +#include "js/quickjs/xhr.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" @@ -69,7 +69,7 @@ #include "viewer/text/view.h" #include "viewer/text/vs.h" -#include "ecmascript/fetch.h" +#include "js/fetch.h" /*** Global methods */ diff --git a/src/ecmascript/quickjs.h b/src/js/quickjs.h similarity index 100% rename from src/ecmascript/quickjs.h rename to src/js/quickjs.h diff --git a/src/ecmascript/quickjs/Makefile b/src/js/quickjs/Makefile similarity index 100% rename from src/ecmascript/quickjs/Makefile rename to src/js/quickjs/Makefile diff --git a/src/ecmascript/quickjs/attr.c b/src/js/quickjs/attr.c similarity index 97% rename from src/ecmascript/quickjs/attr.c rename to src/js/quickjs/attr.c index 467ae8d6b..5c27c9bf4 100644 --- a/src/ecmascript/quickjs/attr.c +++ b/src/js/quickjs/attr.c @@ -13,9 +13,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/attr.h b/src/js/quickjs/attr.h similarity index 100% rename from src/ecmascript/quickjs/attr.h rename to src/js/quickjs/attr.h diff --git a/src/ecmascript/quickjs/attributes.c b/src/js/quickjs/attributes.c similarity index 97% rename from src/ecmascript/quickjs/attributes.c rename to src/js/quickjs/attributes.c index f1f5c8a42..a32f0cd94 100644 --- a/src/ecmascript/quickjs/attributes.c +++ b/src/js/quickjs/attributes.c @@ -14,11 +14,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/attr.h" -#include "ecmascript/quickjs/attributes.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/attr.h" +#include "js/quickjs/attributes.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/attributes.h b/src/js/quickjs/attributes.h similarity index 100% rename from src/ecmascript/quickjs/attributes.h rename to src/js/quickjs/attributes.h diff --git a/src/ecmascript/quickjs/collection.c b/src/js/quickjs/collection.c similarity index 97% rename from src/ecmascript/quickjs/collection.c rename to src/js/quickjs/collection.c index 531b32125..4a4a055a7 100644 --- a/src/ecmascript/quickjs/collection.c +++ b/src/js/quickjs/collection.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/collection.h" -#include "ecmascript/quickjs/element.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/collection.h" +#include "js/quickjs/element.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/collection.h b/src/js/quickjs/collection.h similarity index 100% rename from src/ecmascript/quickjs/collection.h rename to src/js/quickjs/collection.h diff --git a/src/ecmascript/quickjs/collection2.c b/src/js/quickjs/collection2.c similarity index 97% rename from src/ecmascript/quickjs/collection2.c rename to src/js/quickjs/collection2.c index 4b77796ce..ed0d74b7f 100644 --- a/src/ecmascript/quickjs/collection2.c +++ b/src/js/quickjs/collection2.c @@ -16,12 +16,12 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/collection.h" -#include "ecmascript/quickjs/element.h" +#include "js/ecmascript-c.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/collection.h" +#include "js/quickjs/element.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/console.c b/src/js/quickjs/console.c similarity index 97% rename from src/ecmascript/quickjs/console.c rename to src/js/quickjs/console.c index e8990842a..bc8cebf68 100644 --- a/src/ecmascript/quickjs/console.c +++ b/src/js/quickjs/console.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/console.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/console.h" #include "main/main.h" #define DEBUG 0 diff --git a/src/ecmascript/quickjs/console.h b/src/js/quickjs/console.h similarity index 100% rename from src/ecmascript/quickjs/console.h rename to src/js/quickjs/console.h diff --git a/src/ecmascript/quickjs/css.c b/src/js/quickjs/css.c similarity index 96% rename from src/ecmascript/quickjs/css.c rename to src/js/quickjs/css.c index 2b911057e..dfafa0368 100644 --- a/src/ecmascript/quickjs/css.c +++ b/src/js/quickjs/css.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/css.h" -#include "ecmascript/quickjs/element.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/css.h" +#include "js/quickjs/element.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/css.h b/src/js/quickjs/css.h similarity index 100% rename from src/ecmascript/quickjs/css.h rename to src/js/quickjs/css.h diff --git a/src/ecmascript/quickjs/customevent.c b/src/js/quickjs/customevent.c similarity index 98% rename from src/ecmascript/quickjs/customevent.c rename to src/js/quickjs/customevent.c index 5c51bec50..9f0d86fd7 100644 --- a/src/ecmascript/quickjs/customevent.c +++ b/src/js/quickjs/customevent.c @@ -12,11 +12,11 @@ #include "document/document.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" #include "intl/charsets.h" #include "terminal/event.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/quickjs/customevent.h b/src/js/quickjs/customevent.h similarity index 100% rename from src/ecmascript/quickjs/customevent.h rename to src/js/quickjs/customevent.h diff --git a/src/ecmascript/quickjs/dataset.c b/src/js/quickjs/dataset.c similarity index 96% rename from src/ecmascript/quickjs/dataset.c rename to src/js/quickjs/dataset.c index 3fa23034e..1aecea0aa 100644 --- a/src/ecmascript/quickjs/dataset.c +++ b/src/js/quickjs/dataset.c @@ -16,12 +16,12 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/dataset.h" -#include "ecmascript/quickjs/element.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/dataset.h" +#include "js/quickjs/element.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/dataset.h b/src/js/quickjs/dataset.h similarity index 100% rename from src/ecmascript/quickjs/dataset.h rename to src/js/quickjs/dataset.h diff --git a/src/ecmascript/quickjs/document.c b/src/js/quickjs/document.c similarity index 98% rename from src/ecmascript/quickjs/document.c rename to src/js/quickjs/document.c index aa69b9f61..14c748c80 100644 --- a/src/ecmascript/quickjs/document.c +++ b/src/js/quickjs/document.c @@ -20,24 +20,24 @@ #include "document/document.h" #include "document/libdom/doc.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/libdom/parse.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/collection.h" -#include "ecmascript/quickjs/event.h" -#include "ecmascript/quickjs/form.h" -#include "ecmascript/quickjs/forms.h" -#include "ecmascript/quickjs/fragment.h" -#include "ecmascript/quickjs/implementation.h" -#include "ecmascript/quickjs/location.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/nodelist.h" -#include "ecmascript/quickjs/nodelist2.h" -#include "ecmascript/quickjs/text.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/libdom/parse.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/collection.h" +#include "js/quickjs/event.h" +#include "js/quickjs/form.h" +#include "js/quickjs/forms.h" +#include "js/quickjs/fragment.h" +#include "js/quickjs/implementation.h" +#include "js/quickjs/location.h" +#include "js/quickjs/document.h" +#include "js/quickjs/element.h" +#include "js/quickjs/nodelist.h" +#include "js/quickjs/nodelist2.h" +#include "js/quickjs/text.h" +#include "js/quickjs/window.h" #include "session/session.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/quickjs/document.h b/src/js/quickjs/document.h similarity index 100% rename from src/ecmascript/quickjs/document.h rename to src/js/quickjs/document.h diff --git a/src/ecmascript/quickjs/domparser.c b/src/js/quickjs/domparser.c similarity index 93% rename from src/ecmascript/quickjs/domparser.c rename to src/js/quickjs/domparser.c index ef2801727..a38955f15 100644 --- a/src/ecmascript/quickjs/domparser.c +++ b/src/js/quickjs/domparser.c @@ -11,11 +11,11 @@ #include "elinks.h" #include "document/libdom/doc.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/domparser.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/quickjs.h" +#include "js/quickjs/document.h" +#include "js/quickjs/domparser.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/quickjs/domparser.h b/src/js/quickjs/domparser.h similarity index 100% rename from src/ecmascript/quickjs/domparser.h rename to src/js/quickjs/domparser.h diff --git a/src/ecmascript/quickjs/domrect.c b/src/js/quickjs/domrect.c similarity index 98% rename from src/ecmascript/quickjs/domrect.c rename to src/js/quickjs/domrect.c index 0d874c7ac..9340ff547 100644 --- a/src/ecmascript/quickjs/domrect.c +++ b/src/js/quickjs/domrect.c @@ -10,11 +10,11 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/quickjs/domrect.h b/src/js/quickjs/domrect.h similarity index 100% rename from src/ecmascript/quickjs/domrect.h rename to src/js/quickjs/domrect.h diff --git a/src/ecmascript/quickjs/element.c b/src/js/quickjs/element.c similarity index 99% rename from src/ecmascript/quickjs/element.c rename to src/js/quickjs/element.c index f9072b3c0..0527fb6ef 100644 --- a/src/ecmascript/quickjs/element.c +++ b/src/js/quickjs/element.c @@ -22,27 +22,27 @@ #include "document/libdom/mapa.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/attr.h" -#include "ecmascript/quickjs/attributes.h" -#include "ecmascript/quickjs/collection.h" -#include "ecmascript/quickjs/dataset.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/domrect.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" -#include "ecmascript/quickjs/fragment.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/keyboard.h" -#include "ecmascript/quickjs/nodelist.h" -#include "ecmascript/quickjs/nodelist2.h" -#include "ecmascript/quickjs/style.h" -#include "ecmascript/quickjs/text.h" -#include "ecmascript/quickjs/tokenlist.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/attr.h" +#include "js/quickjs/attributes.h" +#include "js/quickjs/collection.h" +#include "js/quickjs/dataset.h" +#include "js/quickjs/document.h" +#include "js/quickjs/domrect.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" +#include "js/quickjs/fragment.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/keyboard.h" +#include "js/quickjs/nodelist.h" +#include "js/quickjs/nodelist2.h" +#include "js/quickjs/style.h" +#include "js/quickjs/text.h" +#include "js/quickjs/tokenlist.h" +#include "js/quickjs/window.h" #include "session/session.h" #include "terminal/event.h" #include "viewer/text/draw.h" diff --git a/src/ecmascript/quickjs/element.h b/src/js/quickjs/element.h similarity index 100% rename from src/ecmascript/quickjs/element.h rename to src/js/quickjs/element.h diff --git a/src/ecmascript/quickjs/event.c b/src/js/quickjs/event.c similarity index 97% rename from src/ecmascript/quickjs/event.c rename to src/js/quickjs/event.c index c6c68e09a..ae3ca0663 100644 --- a/src/ecmascript/quickjs/event.c +++ b/src/js/quickjs/event.c @@ -10,11 +10,11 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/quickjs/event.h b/src/js/quickjs/event.h similarity index 100% rename from src/ecmascript/quickjs/event.h rename to src/js/quickjs/event.h diff --git a/src/ecmascript/quickjs/form.c b/src/js/quickjs/form.c similarity index 98% rename from src/ecmascript/quickjs/form.c rename to src/js/quickjs/form.c index 6c2bb93e0..5be7b71a5 100644 --- a/src/ecmascript/quickjs/form.c +++ b/src/js/quickjs/form.c @@ -12,14 +12,14 @@ #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/form.h" -#include "ecmascript/quickjs/forms.h" -#include "ecmascript/quickjs/input.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/document.h" +#include "js/quickjs/form.h" +#include "js/quickjs/forms.h" +#include "js/quickjs/input.h" +#include "js/quickjs/window.h" #include "session/session.h" #include "viewer/text/form.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/quickjs/form.h b/src/js/quickjs/form.h similarity index 100% rename from src/ecmascript/quickjs/form.h rename to src/js/quickjs/form.h diff --git a/src/ecmascript/quickjs/forms.c b/src/js/quickjs/forms.c similarity index 95% rename from src/ecmascript/quickjs/forms.c rename to src/js/quickjs/forms.c index 29017b1cc..72582a47f 100644 --- a/src/ecmascript/quickjs/forms.c +++ b/src/js/quickjs/forms.c @@ -13,14 +13,14 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/form.h" -#include "ecmascript/quickjs/forms.h" -#include "ecmascript/quickjs/input.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/document.h" +#include "js/quickjs/form.h" +#include "js/quickjs/forms.h" +#include "js/quickjs/input.h" +#include "js/quickjs/window.h" #include "viewer/text/form.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/quickjs/forms.h b/src/js/quickjs/forms.h similarity index 100% rename from src/ecmascript/quickjs/forms.h rename to src/js/quickjs/forms.h diff --git a/src/ecmascript/quickjs/fragment.c b/src/js/quickjs/fragment.c similarity index 98% rename from src/ecmascript/quickjs/fragment.c rename to src/js/quickjs/fragment.c index c26203e24..7a7940d4d 100644 --- a/src/ecmascript/quickjs/fragment.c +++ b/src/js/quickjs/fragment.c @@ -22,25 +22,25 @@ #include "document/libdom/mapa.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/attr.h" -#include "ecmascript/quickjs/attributes.h" -#include "ecmascript/quickjs/collection.h" -#include "ecmascript/quickjs/dataset.h" -#include "ecmascript/quickjs/domrect.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" -#include "ecmascript/quickjs/fragment.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/keyboard.h" -#include "ecmascript/quickjs/nodelist.h" -#include "ecmascript/quickjs/nodelist2.h" -#include "ecmascript/quickjs/style.h" -#include "ecmascript/quickjs/tokenlist.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/attr.h" +#include "js/quickjs/attributes.h" +#include "js/quickjs/collection.h" +#include "js/quickjs/dataset.h" +#include "js/quickjs/domrect.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" +#include "js/quickjs/fragment.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/keyboard.h" +#include "js/quickjs/nodelist.h" +#include "js/quickjs/nodelist2.h" +#include "js/quickjs/style.h" +#include "js/quickjs/tokenlist.h" +#include "js/quickjs/window.h" #include "session/session.h" #include "terminal/event.h" #include "viewer/text/draw.h" diff --git a/src/ecmascript/quickjs/fragment.h b/src/js/quickjs/fragment.h similarity index 100% rename from src/ecmascript/quickjs/fragment.h rename to src/js/quickjs/fragment.h diff --git a/src/ecmascript/quickjs/heartbeat.c b/src/js/quickjs/heartbeat.c similarity index 96% rename from src/ecmascript/quickjs/heartbeat.c rename to src/js/quickjs/heartbeat.c index 17553f30b..4d2f22358 100644 --- a/src/ecmascript/quickjs/heartbeat.c +++ b/src/js/quickjs/heartbeat.c @@ -11,9 +11,9 @@ #include "config/options.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/heartbeat.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/heartbeat.h" #include "osdep/signals.h" #include "session/session.h" #include "util/lists.h" diff --git a/src/ecmascript/quickjs/heartbeat.h b/src/js/quickjs/heartbeat.h similarity index 100% rename from src/ecmascript/quickjs/heartbeat.h rename to src/js/quickjs/heartbeat.h diff --git a/src/ecmascript/quickjs/history.c b/src/js/quickjs/history.c similarity index 96% rename from src/ecmascript/quickjs/history.c rename to src/js/quickjs/history.c index 14613ab6b..df7cc5db9 100644 --- a/src/ecmascript/quickjs/history.c +++ b/src/js/quickjs/history.c @@ -19,10 +19,10 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/history.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/history.h" +#include "js/quickjs/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/quickjs/history.h b/src/js/quickjs/history.h similarity index 100% rename from src/ecmascript/quickjs/history.h rename to src/js/quickjs/history.h diff --git a/src/ecmascript/quickjs/implementation.c b/src/js/quickjs/implementation.c similarity index 95% rename from src/ecmascript/quickjs/implementation.c rename to src/js/quickjs/implementation.c index 419575be8..d700271dc 100644 --- a/src/ecmascript/quickjs/implementation.c +++ b/src/js/quickjs/implementation.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/doc.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/parse.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/implementation.h" +#include "js/ecmascript.h" +#include "js/libdom/parse.h" +#include "js/quickjs.h" +#include "js/quickjs/document.h" +#include "js/quickjs/implementation.h" #include "util/conv.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/implementation.h b/src/js/quickjs/implementation.h similarity index 100% rename from src/ecmascript/quickjs/implementation.h rename to src/js/quickjs/implementation.h diff --git a/src/ecmascript/quickjs/input.c b/src/js/quickjs/input.c similarity index 99% rename from src/ecmascript/quickjs/input.c rename to src/js/quickjs/input.c index 824b8debb..ff31c1c60 100644 --- a/src/ecmascript/quickjs/input.c +++ b/src/js/quickjs/input.c @@ -13,14 +13,14 @@ #include "dialogs/status.h" #include "document/document.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/document.h" -#include "ecmascript/quickjs/form.h" -#include "ecmascript/quickjs/forms.h" -#include "ecmascript/quickjs/input.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/document.h" +#include "js/quickjs/form.h" +#include "js/quickjs/forms.h" +#include "js/quickjs/input.h" +#include "js/quickjs/window.h" #include "intl/charsets.h" #include "viewer/text/draw.h" #include "viewer/text/form.h" diff --git a/src/ecmascript/quickjs/input.h b/src/js/quickjs/input.h similarity index 100% rename from src/ecmascript/quickjs/input.h rename to src/js/quickjs/input.h diff --git a/src/ecmascript/quickjs/keyboard.c b/src/js/quickjs/keyboard.c similarity index 98% rename from src/ecmascript/quickjs/keyboard.c rename to src/js/quickjs/keyboard.c index 423958303..aa2db2fd2 100644 --- a/src/ecmascript/quickjs/keyboard.c +++ b/src/js/quickjs/keyboard.c @@ -10,14 +10,14 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" #include "document/libdom/corestrings.h" #include "document/libdom/doc.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/keyboard.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/keyboard.h" #include "intl/charsets.h" #include "terminal/event.h" diff --git a/src/ecmascript/quickjs/keyboard.h b/src/js/quickjs/keyboard.h similarity index 100% rename from src/ecmascript/quickjs/keyboard.h rename to src/js/quickjs/keyboard.h diff --git a/src/ecmascript/quickjs/localstorage.c b/src/js/quickjs/localstorage.c similarity index 97% rename from src/ecmascript/quickjs/localstorage.c rename to src/js/quickjs/localstorage.c index e44d6bddf..91435c0fb 100644 --- a/src/ecmascript/quickjs/localstorage.c +++ b/src/js/quickjs/localstorage.c @@ -12,10 +12,10 @@ #include "bfu/leds.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/localstorage-db.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/localstorage.h" +#include "js/ecmascript.h" +#include "js/localstorage-db.h" +#include "js/quickjs.h" +#include "js/quickjs/localstorage.h" #include "session/session.h" #include "viewer/text/vs.h" diff --git a/src/ecmascript/quickjs/localstorage.h b/src/js/quickjs/localstorage.h similarity index 100% rename from src/ecmascript/quickjs/localstorage.h rename to src/js/quickjs/localstorage.h diff --git a/src/ecmascript/quickjs/location.c b/src/js/quickjs/location.c similarity index 99% rename from src/ecmascript/quickjs/location.c rename to src/js/quickjs/location.c index ae185cd59..061cd1265 100644 --- a/src/ecmascript/quickjs/location.c +++ b/src/js/quickjs/location.c @@ -12,9 +12,9 @@ #include "document/document.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/location.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/location.h" #include "protocol/uri.h" #include "session/history.h" #include "session/location.h" diff --git a/src/ecmascript/quickjs/location.h b/src/js/quickjs/location.h similarity index 100% rename from src/ecmascript/quickjs/location.h rename to src/js/quickjs/location.h diff --git a/src/ecmascript/quickjs/mapa.c b/src/js/quickjs/mapa.c similarity index 99% rename from src/ecmascript/quickjs/mapa.c rename to src/js/quickjs/mapa.c index f016f398c..dc076460e 100644 --- a/src/ecmascript/quickjs/mapa.c +++ b/src/js/quickjs/mapa.c @@ -9,9 +9,9 @@ #include "elinks.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs/xhr.h" +#include "js/quickjs.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs/xhr.h" #include "util/hash.h" #include "util/memory.h" #include "util/string.h" diff --git a/src/ecmascript/quickjs/mapa.h b/src/js/quickjs/mapa.h similarity index 100% rename from src/ecmascript/quickjs/mapa.h rename to src/js/quickjs/mapa.h diff --git a/src/ecmascript/quickjs/meson.build b/src/js/quickjs/meson.build similarity index 100% rename from src/ecmascript/quickjs/meson.build rename to src/js/quickjs/meson.build diff --git a/src/ecmascript/quickjs/message.c b/src/js/quickjs/message.c similarity index 99% rename from src/ecmascript/quickjs/message.c rename to src/js/quickjs/message.c index 0c3007973..64860efdc 100644 --- a/src/ecmascript/quickjs/message.c +++ b/src/js/quickjs/message.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/message.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/message.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/message.h b/src/js/quickjs/message.h similarity index 100% rename from src/ecmascript/quickjs/message.h rename to src/js/quickjs/message.h diff --git a/src/ecmascript/quickjs/navigator.c b/src/js/quickjs/navigator.c similarity index 97% rename from src/ecmascript/quickjs/navigator.c rename to src/js/quickjs/navigator.c index 697320956..5321a7dd2 100644 --- a/src/ecmascript/quickjs/navigator.c +++ b/src/js/quickjs/navigator.c @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/navigator.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/navigator.h" #include "intl/libintl.h" #include "osdep/sysname.h" #include "protocol/http/http.h" diff --git a/src/ecmascript/quickjs/navigator.h b/src/js/quickjs/navigator.h similarity index 100% rename from src/ecmascript/quickjs/navigator.h rename to src/js/quickjs/navigator.h diff --git a/src/ecmascript/quickjs/node.c b/src/js/quickjs/node.c similarity index 94% rename from src/ecmascript/quickjs/node.c rename to src/js/quickjs/node.c index 9c3d0689b..aa228b760 100644 --- a/src/ecmascript/quickjs/node.c +++ b/src/js/quickjs/node.c @@ -15,11 +15,11 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/nodelist.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/nodelist.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/node.h b/src/js/quickjs/node.h similarity index 100% rename from src/ecmascript/quickjs/node.h rename to src/js/quickjs/node.h diff --git a/src/ecmascript/quickjs/nodelist.c b/src/js/quickjs/nodelist.c similarity index 96% rename from src/ecmascript/quickjs/nodelist.c rename to src/js/quickjs/nodelist.c index 3ea4ec3db..01491bb70 100644 --- a/src/ecmascript/quickjs/nodelist.c +++ b/src/js/quickjs/nodelist.c @@ -15,11 +15,11 @@ #include "elinks.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/nodelist.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/nodelist.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/nodelist.h b/src/js/quickjs/nodelist.h similarity index 100% rename from src/ecmascript/quickjs/nodelist.h rename to src/js/quickjs/nodelist.h diff --git a/src/ecmascript/quickjs/nodelist2.c b/src/js/quickjs/nodelist2.c similarity index 91% rename from src/ecmascript/quickjs/nodelist2.c rename to src/js/quickjs/nodelist2.c index dde8bea2b..1a095feaa 100644 --- a/src/ecmascript/quickjs/nodelist2.c +++ b/src/js/quickjs/nodelist2.c @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" #include "bfu/dialog.h" #include "cache/cache.h" @@ -21,13 +21,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/nodelist2.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/nodelist2.h" +#include "js/quickjs/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/quickjs/nodelist2.h b/src/js/quickjs/nodelist2.h similarity index 100% rename from src/ecmascript/quickjs/nodelist2.h rename to src/js/quickjs/nodelist2.h diff --git a/src/ecmascript/quickjs/screen.c b/src/js/quickjs/screen.c similarity index 97% rename from src/ecmascript/quickjs/screen.c rename to src/js/quickjs/screen.c index e9a33ba03..8a3efc175 100644 --- a/src/ecmascript/quickjs/screen.c +++ b/src/js/quickjs/screen.c @@ -11,9 +11,9 @@ #include "elinks.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/screen.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/screen.h" #include "session/session.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/screen.h b/src/js/quickjs/screen.h similarity index 100% rename from src/ecmascript/quickjs/screen.h rename to src/js/quickjs/screen.h diff --git a/src/ecmascript/quickjs/style.c b/src/js/quickjs/style.c similarity index 99% rename from src/ecmascript/quickjs/style.c rename to src/js/quickjs/style.c index e63d02b4f..3af7c2475 100644 --- a/src/ecmascript/quickjs/style.c +++ b/src/js/quickjs/style.c @@ -14,10 +14,10 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs/style.h" -#include "ecmascript/quickjs.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs/style.h" +#include "js/quickjs.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/style.h b/src/js/quickjs/style.h similarity index 100% rename from src/ecmascript/quickjs/style.h rename to src/js/quickjs/style.h diff --git a/src/ecmascript/quickjs/text.c b/src/js/quickjs/text.c similarity index 98% rename from src/ecmascript/quickjs/text.c rename to src/js/quickjs/text.c index 124825f5c..933c356e4 100644 --- a/src/ecmascript/quickjs/text.c +++ b/src/js/quickjs/text.c @@ -22,25 +22,25 @@ #include "document/libdom/mapa.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/attr.h" -#include "ecmascript/quickjs/attributes.h" -#include "ecmascript/quickjs/collection.h" -#include "ecmascript/quickjs/dataset.h" -#include "ecmascript/quickjs/domrect.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/event.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/keyboard.h" -#include "ecmascript/quickjs/nodelist.h" -#include "ecmascript/quickjs/nodelist2.h" -#include "ecmascript/quickjs/style.h" -#include "ecmascript/quickjs/text.h" -#include "ecmascript/quickjs/tokenlist.h" -#include "ecmascript/quickjs/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/attr.h" +#include "js/quickjs/attributes.h" +#include "js/quickjs/collection.h" +#include "js/quickjs/dataset.h" +#include "js/quickjs/domrect.h" +#include "js/quickjs/element.h" +#include "js/quickjs/event.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/keyboard.h" +#include "js/quickjs/nodelist.h" +#include "js/quickjs/nodelist2.h" +#include "js/quickjs/style.h" +#include "js/quickjs/text.h" +#include "js/quickjs/tokenlist.h" +#include "js/quickjs/window.h" #include "session/session.h" #include "terminal/event.h" #include "viewer/text/draw.h" diff --git a/src/ecmascript/quickjs/text.h b/src/js/quickjs/text.h similarity index 100% rename from src/ecmascript/quickjs/text.h rename to src/js/quickjs/text.h diff --git a/src/ecmascript/quickjs/tokenlist.c b/src/js/quickjs/tokenlist.c similarity index 96% rename from src/ecmascript/quickjs/tokenlist.c rename to src/js/quickjs/tokenlist.c index 5949c2d21..dfb3614b0 100644 --- a/src/ecmascript/quickjs/tokenlist.c +++ b/src/js/quickjs/tokenlist.c @@ -16,11 +16,11 @@ #include "elinks.h" #include "document/libdom/corestrings.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/tokenlist.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/element.h" +#include "js/quickjs/tokenlist.h" #define countof(x) (sizeof(x) / sizeof((x)[0])) diff --git a/src/ecmascript/quickjs/tokenlist.h b/src/js/quickjs/tokenlist.h similarity index 100% rename from src/ecmascript/quickjs/tokenlist.h rename to src/js/quickjs/tokenlist.h diff --git a/src/ecmascript/quickjs/unibar.c b/src/js/quickjs/unibar.c similarity index 97% rename from src/ecmascript/quickjs/unibar.c rename to src/js/quickjs/unibar.c index 2274dc7fc..6242910a2 100644 --- a/src/ecmascript/quickjs/unibar.c +++ b/src/js/quickjs/unibar.c @@ -12,9 +12,9 @@ #include "dialogs/status.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/unibar.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/unibar.h" #include "main/select.h" #include "session/session.h" diff --git a/src/ecmascript/quickjs/unibar.h b/src/js/quickjs/unibar.h similarity index 100% rename from src/ecmascript/quickjs/unibar.h rename to src/js/quickjs/unibar.h diff --git a/src/ecmascript/quickjs/url.c b/src/js/quickjs/url.c similarity index 99% rename from src/ecmascript/quickjs/url.c rename to src/js/quickjs/url.c index 63c8769ad..a0cac5037 100644 --- a/src/ecmascript/quickjs/url.c +++ b/src/js/quickjs/url.c @@ -19,10 +19,10 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/url.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/url.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/quickjs/url.h b/src/js/quickjs/url.h similarity index 100% rename from src/ecmascript/quickjs/url.h rename to src/js/quickjs/url.h diff --git a/src/ecmascript/quickjs/urlsearchparams.c b/src/js/quickjs/urlsearchparams.c similarity index 98% rename from src/ecmascript/quickjs/urlsearchparams.c rename to src/js/quickjs/urlsearchparams.c index ba3cd01fd..a79b6950a 100644 --- a/src/ecmascript/quickjs/urlsearchparams.c +++ b/src/js/quickjs/urlsearchparams.c @@ -19,11 +19,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/urlsearchparams.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/urlsearchparams.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/quickjs/urlsearchparams.h b/src/js/quickjs/urlsearchparams.h similarity index 100% rename from src/ecmascript/quickjs/urlsearchparams.h rename to src/js/quickjs/urlsearchparams.h diff --git a/src/ecmascript/quickjs/window.c b/src/js/quickjs/window.c similarity index 98% rename from src/ecmascript/quickjs/window.c rename to src/js/quickjs/window.c index 02aca6ae2..e0301a62c 100644 --- a/src/ecmascript/quickjs/window.c +++ b/src/js/quickjs/window.c @@ -20,16 +20,16 @@ #include "dialogs/status.h" #include "document/document.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/css.h" -#include "ecmascript/quickjs/element.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/keyboard.h" -#include "ecmascript/quickjs/location.h" -#include "ecmascript/quickjs/message.h" -#include "ecmascript/quickjs/window.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/quickjs.h" +#include "js/quickjs/css.h" +#include "js/quickjs/element.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/keyboard.h" +#include "js/quickjs/location.h" +#include "js/quickjs/message.h" +#include "js/quickjs/window.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/quickjs/window.h b/src/js/quickjs/window.h similarity index 100% rename from src/ecmascript/quickjs/window.h rename to src/js/quickjs/window.h diff --git a/src/ecmascript/quickjs/xhr.c b/src/js/quickjs/xhr.c similarity index 99% rename from src/ecmascript/quickjs/xhr.c rename to src/js/quickjs/xhr.c index 1924c3af9..79f8bbe15 100644 --- a/src/ecmascript/quickjs/xhr.c +++ b/src/js/quickjs/xhr.c @@ -38,11 +38,11 @@ #include "cache/cache.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/quickjs/mapa.h" -#include "ecmascript/quickjs.h" -#include "ecmascript/quickjs/heartbeat.h" -#include "ecmascript/quickjs/xhr.h" +#include "js/ecmascript.h" +#include "js/quickjs/mapa.h" +#include "js/quickjs.h" +#include "js/quickjs/heartbeat.h" +#include "js/quickjs/xhr.h" #include "main/select.h" #include "network/connection.h" #include "protocol/uri.h" diff --git a/src/ecmascript/quickjs/xhr.h b/src/js/quickjs/xhr.h similarity index 100% rename from src/ecmascript/quickjs/xhr.h rename to src/js/quickjs/xhr.h diff --git a/src/ecmascript/spidermonkey-shared.cpp b/src/js/spidermonkey-shared.cpp similarity index 98% rename from src/ecmascript/spidermonkey-shared.cpp rename to src/js/spidermonkey-shared.cpp index 95ee54a4e..04ef0d0f9 100644 --- a/src/ecmascript/spidermonkey-shared.cpp +++ b/src/js/spidermonkey-shared.cpp @@ -7,7 +7,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include /** A JSContext that can be used in JS_SetPrivate and JS_GetPrivate diff --git a/src/ecmascript/spidermonkey-shared.h b/src/js/spidermonkey-shared.h similarity index 100% rename from src/ecmascript/spidermonkey-shared.h rename to src/js/spidermonkey-shared.h diff --git a/src/ecmascript/spidermonkey.cpp b/src/js/spidermonkey.cpp similarity index 94% rename from src/ecmascript/spidermonkey.cpp rename to src/js/spidermonkey.cpp index fb22caa1a..8bdbb246f 100644 --- a/src/ecmascript/spidermonkey.cpp +++ b/src/js/spidermonkey.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "bfu/dialog.h" #include "cache/cache.h" @@ -25,28 +25,28 @@ #include "document/forms.h" #include "document/renderer.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/console.h" -#include "ecmascript/spidermonkey/customevent.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/domparser.h" -#include "ecmascript/spidermonkey/event.h" -#include "ecmascript/spidermonkey/form.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/history.h" -#include "ecmascript/spidermonkey/keyboard.h" -#include "ecmascript/spidermonkey/location.h" -#include "ecmascript/spidermonkey/localstorage.h" -#include "ecmascript/spidermonkey/message.h" -#include "ecmascript/spidermonkey/navigator.h" -#include "ecmascript/spidermonkey/node.h" -#include "ecmascript/spidermonkey/screen.h" -#include "ecmascript/spidermonkey/unibar.h" -#include "ecmascript/spidermonkey/url.h" -#include "ecmascript/spidermonkey/urlsearchparams.h" -#include "ecmascript/spidermonkey/window.h" -#include "ecmascript/spidermonkey/xhr.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/console.h" +#include "js/spidermonkey/customevent.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/domparser.h" +#include "js/spidermonkey/event.h" +#include "js/spidermonkey/form.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/history.h" +#include "js/spidermonkey/keyboard.h" +#include "js/spidermonkey/location.h" +#include "js/spidermonkey/localstorage.h" +#include "js/spidermonkey/message.h" +#include "js/spidermonkey/navigator.h" +#include "js/spidermonkey/node.h" +#include "js/spidermonkey/screen.h" +#include "js/spidermonkey/unibar.h" +#include "js/spidermonkey/url.h" +#include "js/spidermonkey/urlsearchparams.h" +#include "js/spidermonkey/window.h" +#include "js/spidermonkey/xhr.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" @@ -78,7 +78,7 @@ /*** Global methods */ -#include "ecmascript/fetch.h" +#include "js/fetch.h" /* TODO? Are there any which need to be implemented? */ diff --git a/src/ecmascript/spidermonkey.h b/src/js/spidermonkey.h similarity index 100% rename from src/ecmascript/spidermonkey.h rename to src/js/spidermonkey.h diff --git a/src/ecmascript/spidermonkey/Makefile b/src/js/spidermonkey/Makefile similarity index 100% rename from src/ecmascript/spidermonkey/Makefile rename to src/js/spidermonkey/Makefile diff --git a/src/ecmascript/spidermonkey/attr.cpp b/src/js/spidermonkey/attr.cpp similarity index 97% rename from src/ecmascript/spidermonkey/attr.cpp rename to src/js/spidermonkey/attr.cpp index 20af6233d..564924606 100644 --- a/src/ecmascript/spidermonkey/attr.cpp +++ b/src/js/spidermonkey/attr.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,9 +22,9 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/spidermonkey/attr.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/spidermonkey/attr.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/attr.h b/src/js/spidermonkey/attr.h similarity index 77% rename from src/ecmascript/spidermonkey/attr.h rename to src/js/spidermonkey/attr.h index 62e4498db..6c9786e16 100644 --- a/src/ecmascript/spidermonkey/attr.h +++ b/src/js/spidermonkey/attr.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_ATTR_H #define EL__ECMASCRIPT_SPIDERMONKEY_ATTR_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getAttr(JSContext *ctx, void *node); diff --git a/src/ecmascript/spidermonkey/attributes.cpp b/src/js/spidermonkey/attributes.cpp similarity index 97% rename from src/ecmascript/spidermonkey/attributes.cpp rename to src/js/spidermonkey/attributes.cpp index f3811cd15..1b2febeec 100644 --- a/src/ecmascript/spidermonkey/attributes.cpp +++ b/src/js/spidermonkey/attributes.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -25,9 +25,9 @@ #include "document/forms.h" #include "document/libdom/corestrings.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/attr.h" -#include "ecmascript/spidermonkey/attributes.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/attr.h" +#include "js/spidermonkey/attributes.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/attributes.h b/src/js/spidermonkey/attributes.h similarity index 79% rename from src/ecmascript/spidermonkey/attributes.h rename to src/js/spidermonkey/attributes.h index ca30377d9..4bf4af4d6 100644 --- a/src/ecmascript/spidermonkey/attributes.h +++ b/src/js/spidermonkey/attributes.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_ATTRIBUTES_H #define EL__ECMASCRIPT_SPIDERMONKEY_ATTRIBUTES_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getAttributes(JSContext *ctx, void *node); diff --git a/src/ecmascript/spidermonkey/collection.cpp b/src/js/spidermonkey/collection.cpp similarity index 98% rename from src/ecmascript/spidermonkey/collection.cpp rename to src/js/spidermonkey/collection.cpp index 839766b88..16bfc4986 100644 --- a/src/ecmascript/spidermonkey/collection.cpp +++ b/src/js/spidermonkey/collection.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -25,9 +25,9 @@ #include "document/forms.h" #include "document/libdom/corestrings.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/element.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/collection.h" +#include "js/spidermonkey/element.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/collection.h b/src/js/spidermonkey/collection.h similarity index 79% rename from src/ecmascript/spidermonkey/collection.h rename to src/js/spidermonkey/collection.h index cf2899a5f..3e89756d8 100644 --- a/src/ecmascript/spidermonkey/collection.h +++ b/src/js/spidermonkey/collection.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_COLLECTION_H #define EL__ECMASCRIPT_SPIDERMONKEY_COLLECTION_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getCollection(JSContext *ctx, void *node); diff --git a/src/ecmascript/spidermonkey/console.cpp b/src/js/spidermonkey/console.cpp similarity index 96% rename from src/ecmascript/spidermonkey/console.cpp rename to src/js/spidermonkey/console.cpp index 390327887..11137f58a 100644 --- a/src/ecmascript/spidermonkey/console.cpp +++ b/src/js/spidermonkey/console.cpp @@ -10,15 +10,15 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "bfu/dialog.h" #include "cache/cache.h" #include "config/home.h" #include "dialogs/menu.h" #include "dialogs/status.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/console.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/console.h" #include "intl/libintl.h" #include "main/main.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/console.h b/src/js/spidermonkey/console.h similarity index 85% rename from src/ecmascript/spidermonkey/console.h rename to src/js/spidermonkey/console.h index 6742c215e..203545a1e 100644 --- a/src/ecmascript/spidermonkey/console.h +++ b/src/js/spidermonkey/console.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_CONSOLE_H #define EL__ECMASCRIPT_SPIDERMONKEY_CONSOLE_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern const JSClass console_class; extern const spidermonkeyFunctionSpec console_funcs[]; diff --git a/src/ecmascript/spidermonkey/css.cpp b/src/js/spidermonkey/css.cpp similarity index 97% rename from src/ecmascript/spidermonkey/css.cpp rename to src/js/spidermonkey/css.cpp index 2c9c3df98..846694031 100644 --- a/src/ecmascript/spidermonkey/css.cpp +++ b/src/js/spidermonkey/css.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -25,9 +25,9 @@ #include "document/forms.h" #include "document/libdom/corestrings.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/css.h" -#include "ecmascript/spidermonkey/element.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/css.h" +#include "js/spidermonkey/element.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/css.h b/src/js/spidermonkey/css.h similarity index 78% rename from src/ecmascript/spidermonkey/css.h rename to src/js/spidermonkey/css.h index 60be7ab25..2e7068c49 100644 --- a/src/ecmascript/spidermonkey/css.h +++ b/src/js/spidermonkey/css.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_CSS_H #define EL__ECMASCRIPT_SPIDERMONKEY_CSS_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getCSSStyleDeclaration(JSContext *ctx, void *node); diff --git a/src/ecmascript/spidermonkey/customevent.cpp b/src/js/spidermonkey/customevent.cpp similarity index 97% rename from src/ecmascript/spidermonkey/customevent.cpp rename to src/js/spidermonkey/customevent.cpp index e30979e31..87e41c61a 100644 --- a/src/ecmascript/spidermonkey/customevent.cpp +++ b/src/js/spidermonkey/customevent.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,13 +23,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/customevent.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/customevent.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/customevent.h b/src/js/spidermonkey/customevent.h similarity index 88% rename from src/ecmascript/spidermonkey/customevent.h rename to src/js/spidermonkey/customevent.h index d8c9a24a7..f0d8877fa 100644 --- a/src/ecmascript/spidermonkey/customevent.h +++ b/src/js/spidermonkey/customevent.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_CUSTOMEVENT_H #define EL__ECMASCRIPT_SPIDERMONKEY_CUSTOMEVENT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass customEvent_class; extern JSPropertySpec customEvent_props[]; diff --git a/src/ecmascript/spidermonkey/dataset.cpp b/src/js/spidermonkey/dataset.cpp similarity index 96% rename from src/ecmascript/spidermonkey/dataset.cpp rename to src/js/spidermonkey/dataset.cpp index 73e36ff6b..53bdd85fe 100644 --- a/src/ecmascript/spidermonkey/dataset.cpp +++ b/src/js/spidermonkey/dataset.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -26,10 +26,10 @@ #include "document/forms.h" #include "document/libdom/corestrings.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/spidermonkey/dataset.h" -#include "ecmascript/spidermonkey/element.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/spidermonkey/dataset.h" +#include "js/spidermonkey/element.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/dataset.h b/src/js/spidermonkey/dataset.h similarity index 78% rename from src/ecmascript/spidermonkey/dataset.h rename to src/js/spidermonkey/dataset.h index 3bd4b2044..7ff5b4628 100644 --- a/src/ecmascript/spidermonkey/dataset.h +++ b/src/js/spidermonkey/dataset.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_DATASET_H #define EL__ECMASCRIPT_SPIDERMONKEY_DATASET_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getDataset(JSContext *ctx, void *element); diff --git a/src/ecmascript/spidermonkey/document.cpp b/src/js/spidermonkey/document.cpp similarity index 98% rename from src/ecmascript/spidermonkey/document.cpp rename to src/js/spidermonkey/document.cpp index 18d487e07..194c63592 100644 --- a/src/ecmascript/spidermonkey/document.cpp +++ b/src/js/spidermonkey/document.cpp @@ -10,10 +10,10 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -27,25 +27,25 @@ #include "document/libdom/doc.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/css2xpath.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/libdom/parse.h" -#include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/form.h" -#include "ecmascript/spidermonkey/forms.h" -#include "ecmascript/spidermonkey/implementation.h" -#include "ecmascript/spidermonkey/location.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/event.h" -#include "ecmascript/spidermonkey/fragment.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/nodelist.h" -#include "ecmascript/spidermonkey/nodelist2.h" -#include "ecmascript/spidermonkey/text.h" -#include "ecmascript/spidermonkey/util.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/css2xpath.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/libdom/parse.h" +#include "js/spidermonkey/collection.h" +#include "js/spidermonkey/form.h" +#include "js/spidermonkey/forms.h" +#include "js/spidermonkey/implementation.h" +#include "js/spidermonkey/location.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/event.h" +#include "js/spidermonkey/fragment.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/nodelist.h" +#include "js/spidermonkey/nodelist2.h" +#include "js/spidermonkey/text.h" +#include "js/spidermonkey/util.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/document.h b/src/js/spidermonkey/document.h similarity index 91% rename from src/ecmascript/spidermonkey/document.h rename to src/js/spidermonkey/document.h index ee06e3230..e6401573c 100644 --- a/src/ecmascript/spidermonkey/document.h +++ b/src/js/spidermonkey/document.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_DOCUMENT_H #define EL__ECMASCRIPT_SPIDERMONKEY_DOCUMENT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" struct ecmascript_interpreter; diff --git a/src/ecmascript/spidermonkey/domparser.cpp b/src/js/spidermonkey/domparser.cpp similarity index 91% rename from src/ecmascript/spidermonkey/domparser.cpp rename to src/js/spidermonkey/domparser.cpp index a8c2f0250..7ad58db9d 100644 --- a/src/ecmascript/spidermonkey/domparser.cpp +++ b/src/js/spidermonkey/domparser.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -26,12 +26,12 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/domparser.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/domparser.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/domparser.h b/src/js/spidermonkey/domparser.h similarity index 86% rename from src/ecmascript/spidermonkey/domparser.h rename to src/js/spidermonkey/domparser.h index e1ecfc621..8b3e534a8 100644 --- a/src/ecmascript/spidermonkey/domparser.h +++ b/src/js/spidermonkey/domparser.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_DOMPARSER_H #define EL__ECMASCRIPT_SPIDERMONKEY_DOMPARSER_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass domparser_class; extern const spidermonkeyFunctionSpec domparser_funcs[]; diff --git a/src/ecmascript/spidermonkey/domrect.cpp b/src/js/spidermonkey/domrect.cpp similarity index 98% rename from src/ecmascript/spidermonkey/domrect.cpp rename to src/js/spidermonkey/domrect.cpp index 7746c4066..c07c24476 100644 --- a/src/ecmascript/spidermonkey/domrect.cpp +++ b/src/js/spidermonkey/domrect.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,11 +23,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/domrect.h" -#include "ecmascript/spidermonkey/heartbeat.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/domrect.h" +#include "js/spidermonkey/heartbeat.h" #include #include diff --git a/src/ecmascript/spidermonkey/domrect.h b/src/js/spidermonkey/domrect.h similarity index 83% rename from src/ecmascript/spidermonkey/domrect.h rename to src/js/spidermonkey/domrect.h index f3ac49b24..58f704194 100644 --- a/src/ecmascript/spidermonkey/domrect.h +++ b/src/js/spidermonkey/domrect.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_DOMRECT_H #define EL__ECMASCRIPT_SPIDERMONKEY_DOMRECT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass domRect_class; extern JSPropertySpec domRect_props[]; diff --git a/src/ecmascript/spidermonkey/element.cpp b/src/js/spidermonkey/element.cpp similarity index 99% rename from src/ecmascript/spidermonkey/element.cpp rename to src/js/spidermonkey/element.cpp index 8e4a00a80..4b6a15a92 100644 --- a/src/ecmascript/spidermonkey/element.cpp +++ b/src/js/spidermonkey/element.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -28,22 +28,22 @@ #include "document/libdom/mapa.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/spidermonkey/attr.h" -#include "ecmascript/spidermonkey/attributes.h" -#include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/dataset.h" -#include "ecmascript/spidermonkey/domrect.h" -#include "ecmascript/spidermonkey/event.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/keyboard.h" -#include "ecmascript/spidermonkey/nodelist.h" -#include "ecmascript/spidermonkey/nodelist2.h" -#include "ecmascript/spidermonkey/style.h" -#include "ecmascript/spidermonkey/tokenlist.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/spidermonkey/attr.h" +#include "js/spidermonkey/attributes.h" +#include "js/spidermonkey/collection.h" +#include "js/spidermonkey/dataset.h" +#include "js/spidermonkey/domrect.h" +#include "js/spidermonkey/event.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/keyboard.h" +#include "js/spidermonkey/nodelist.h" +#include "js/spidermonkey/nodelist2.h" +#include "js/spidermonkey/style.h" +#include "js/spidermonkey/tokenlist.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/element.h b/src/js/spidermonkey/element.h similarity index 91% rename from src/ecmascript/spidermonkey/element.h rename to src/js/spidermonkey/element.h index ec48954b3..862ff1bf9 100644 --- a/src/ecmascript/spidermonkey/element.h +++ b/src/js/spidermonkey/element.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_ELEMENT_H #define EL__ECMASCRIPT_SPIDERMONKEY_ELEMENT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" struct term_event; extern JSClass element_class; diff --git a/src/ecmascript/spidermonkey/event.cpp b/src/js/spidermonkey/event.cpp similarity index 96% rename from src/ecmascript/spidermonkey/event.cpp rename to src/js/spidermonkey/event.cpp index 77d1ad240..516caba2f 100644 --- a/src/ecmascript/spidermonkey/event.cpp +++ b/src/js/spidermonkey/event.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,13 +23,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/event.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/event.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/event.h b/src/js/spidermonkey/event.h similarity index 88% rename from src/ecmascript/spidermonkey/event.h rename to src/js/spidermonkey/event.h index 8bc093a2e..1567a87b2 100644 --- a/src/ecmascript/spidermonkey/event.h +++ b/src/js/spidermonkey/event.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_EVENT_H #define EL__ECMASCRIPT_SPIDERMONKEY_EVENT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass event_class; extern JSPropertySpec event_props[]; diff --git a/src/ecmascript/spidermonkey/form.cpp b/src/js/spidermonkey/form.cpp similarity index 99% rename from src/ecmascript/spidermonkey/form.cpp rename to src/js/spidermonkey/form.cpp index d3a08b7be..0868f603f 100644 --- a/src/ecmascript/spidermonkey/form.cpp +++ b/src/js/spidermonkey/form.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,13 +22,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/form.h" -#include "ecmascript/spidermonkey/forms.h" -#include "ecmascript/spidermonkey/input.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/form.h" +#include "js/spidermonkey/forms.h" +#include "js/spidermonkey/input.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/form.h b/src/js/spidermonkey/form.h similarity index 88% rename from src/ecmascript/spidermonkey/form.h rename to src/js/spidermonkey/form.h index b603c24c5..86e80c3ae 100644 --- a/src/ecmascript/spidermonkey/form.h +++ b/src/js/spidermonkey/form.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_FORM_H #define EL__ECMASCRIPT_SPIDERMONKEY_FORM_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" struct form; diff --git a/src/ecmascript/spidermonkey/forms.cpp b/src/js/spidermonkey/forms.cpp similarity index 96% rename from src/ecmascript/spidermonkey/forms.cpp rename to src/js/spidermonkey/forms.cpp index 46e00c93a..76fd3238f 100644 --- a/src/ecmascript/spidermonkey/forms.cpp +++ b/src/js/spidermonkey/forms.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,13 +22,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/form.h" -#include "ecmascript/spidermonkey/forms.h" -#include "ecmascript/spidermonkey/input.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/form.h" +#include "js/spidermonkey/forms.h" +#include "js/spidermonkey/input.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/forms.h b/src/js/spidermonkey/forms.h similarity index 90% rename from src/ecmascript/spidermonkey/forms.h rename to src/js/spidermonkey/forms.h index 40e0c0cac..552793974 100644 --- a/src/ecmascript/spidermonkey/forms.h +++ b/src/js/spidermonkey/forms.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_FORMS_H #define EL__ECMASCRIPT_SPIDERMONKEY_FORMS_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" struct form; diff --git a/src/ecmascript/spidermonkey/fragment.cpp b/src/js/spidermonkey/fragment.cpp similarity index 98% rename from src/ecmascript/spidermonkey/fragment.cpp rename to src/js/spidermonkey/fragment.cpp index ef7b5d73c..3ccdb606d 100644 --- a/src/ecmascript/spidermonkey/fragment.cpp +++ b/src/js/spidermonkey/fragment.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -28,23 +28,23 @@ #include "document/libdom/mapa.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/spidermonkey/attr.h" -#include "ecmascript/spidermonkey/attributes.h" -#include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/dataset.h" -#include "ecmascript/spidermonkey/domrect.h" -#include "ecmascript/spidermonkey/event.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/fragment.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/keyboard.h" -#include "ecmascript/spidermonkey/nodelist.h" -#include "ecmascript/spidermonkey/nodelist2.h" -#include "ecmascript/spidermonkey/style.h" -#include "ecmascript/spidermonkey/tokenlist.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/spidermonkey/attr.h" +#include "js/spidermonkey/attributes.h" +#include "js/spidermonkey/collection.h" +#include "js/spidermonkey/dataset.h" +#include "js/spidermonkey/domrect.h" +#include "js/spidermonkey/event.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/fragment.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/keyboard.h" +#include "js/spidermonkey/nodelist.h" +#include "js/spidermonkey/nodelist2.h" +#include "js/spidermonkey/style.h" +#include "js/spidermonkey/tokenlist.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/fragment.h b/src/js/spidermonkey/fragment.h similarity index 84% rename from src/ecmascript/spidermonkey/fragment.h rename to src/js/spidermonkey/fragment.h index 0897145e8..fd6ff2dd8 100644 --- a/src/ecmascript/spidermonkey/fragment.h +++ b/src/js/spidermonkey/fragment.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_FRAGMENT_H #define EL__ECMASCRIPT_SPIDERMONKEY_FRAGMENT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass fragment_class; extern JSPropertySpec fragment_props[]; diff --git a/src/ecmascript/spidermonkey/heartbeat.cpp b/src/js/spidermonkey/heartbeat.cpp similarity index 95% rename from src/ecmascript/spidermonkey/heartbeat.cpp rename to src/js/spidermonkey/heartbeat.cpp index 9f6f5c0b7..306d1a4b9 100644 --- a/src/ecmascript/spidermonkey/heartbeat.cpp +++ b/src/js/spidermonkey/heartbeat.cpp @@ -9,13 +9,13 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "config/options.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/heartbeat.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/heartbeat.h" #include "osdep/signals.h" #include "session/session.h" #include "util/lists.h" diff --git a/src/ecmascript/spidermonkey/heartbeat.h b/src/js/spidermonkey/heartbeat.h similarity index 89% rename from src/ecmascript/spidermonkey/heartbeat.h rename to src/js/spidermonkey/heartbeat.h index ef03f7e78..f7b22687d 100644 --- a/src/ecmascript/spidermonkey/heartbeat.h +++ b/src/js/spidermonkey/heartbeat.h @@ -1,9 +1,9 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_HEARTBEAT_H #define EL__ECMASCRIPT_SPIDERMONKEY_HEARTBEAT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" -#include "ecmascript/spidermonkey.h" +#include "js/spidermonkey.h" struct heartbeat { LIST_HEAD_EL(struct heartbeat); diff --git a/src/ecmascript/spidermonkey/history.cpp b/src/js/spidermonkey/history.cpp similarity index 97% rename from src/ecmascript/spidermonkey/history.cpp rename to src/js/spidermonkey/history.cpp index d55fd85ec..306800ff2 100644 --- a/src/ecmascript/spidermonkey/history.cpp +++ b/src/js/spidermonkey/history.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,8 +22,8 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/history.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/history.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/history.h b/src/js/spidermonkey/history.h similarity index 81% rename from src/ecmascript/spidermonkey/history.h rename to src/js/spidermonkey/history.h index 3c7730351..cd91ebaaa 100644 --- a/src/ecmascript/spidermonkey/history.h +++ b/src/js/spidermonkey/history.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_HISTORY_H #define EL__ECMASCRIPT_SPIDERMONKEY_HISTORY_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass history_class; extern const spidermonkeyFunctionSpec history_funcs[]; diff --git a/src/ecmascript/spidermonkey/implementation.cpp b/src/js/spidermonkey/implementation.cpp similarity index 90% rename from src/ecmascript/spidermonkey/implementation.cpp rename to src/js/spidermonkey/implementation.cpp index c9cef868e..3cf8e3c52 100644 --- a/src/ecmascript/spidermonkey/implementation.cpp +++ b/src/js/spidermonkey/implementation.cpp @@ -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 "ecmascript/libdom/parse.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/implementation.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/ecmascript.h" +#include "js/libdom/parse.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/implementation.h" +#include "js/spidermonkey/util.h" #include "util/conv.h" #include diff --git a/src/ecmascript/spidermonkey/implementation.h b/src/js/spidermonkey/implementation.h similarity index 79% rename from src/ecmascript/spidermonkey/implementation.h rename to src/js/spidermonkey/implementation.h index ba1898453..51a58c480 100644 --- a/src/ecmascript/spidermonkey/implementation.h +++ b/src/js/spidermonkey/implementation.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_IMPLEMENTATION_H #define EL__ECMASCRIPT_SPIDERMONKEY_IMPLEMENTATION_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getImplementation(JSContext *ctx); diff --git a/src/ecmascript/spidermonkey/input.cpp b/src/js/spidermonkey/input.cpp similarity index 99% rename from src/ecmascript/spidermonkey/input.cpp rename to src/js/spidermonkey/input.cpp index 3ce62b41e..0de94d342 100644 --- a/src/ecmascript/spidermonkey/input.cpp +++ b/src/js/spidermonkey/input.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,13 +22,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/form.h" -#include "ecmascript/spidermonkey/forms.h" -#include "ecmascript/spidermonkey/input.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/form.h" +#include "js/spidermonkey/forms.h" +#include "js/spidermonkey/input.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/input.h b/src/js/spidermonkey/input.h similarity index 81% rename from src/ecmascript/spidermonkey/input.h rename to src/js/spidermonkey/input.h index 742029c3a..b9a9624f5 100644 --- a/src/ecmascript/spidermonkey/input.h +++ b/src/js/spidermonkey/input.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_INPUT_H #define EL__ECMASCRIPT_SPIDERMONKEY_INPUT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" struct form_state; diff --git a/src/ecmascript/spidermonkey/keyboard.cpp b/src/js/spidermonkey/keyboard.cpp similarity index 97% rename from src/ecmascript/spidermonkey/keyboard.cpp rename to src/js/spidermonkey/keyboard.cpp index b0414eb60..2e1c0fd6d 100644 --- a/src/ecmascript/spidermonkey/keyboard.cpp +++ b/src/js/spidermonkey/keyboard.cpp @@ -10,11 +10,11 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" #include "bfu/dialog.h" #include "cache/cache.h" @@ -27,12 +27,12 @@ #include "document/libdom/corestrings.h" #include "document/libdom/doc.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/keyboard.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/keyboard.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/keyboard.h b/src/js/spidermonkey/keyboard.h similarity index 90% rename from src/ecmascript/spidermonkey/keyboard.h rename to src/js/spidermonkey/keyboard.h index 9121ebbfd..dfc6fe3ba 100644 --- a/src/ecmascript/spidermonkey/keyboard.h +++ b/src/js/spidermonkey/keyboard.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_KEYBOARD_H #define EL__ECMASCRIPT_SPIDERMONKEY_KEYBOARD_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" struct term_event; diff --git a/src/ecmascript/spidermonkey/localstorage.cpp b/src/js/spidermonkey/localstorage.cpp similarity index 94% rename from src/ecmascript/spidermonkey/localstorage.cpp rename to src/js/spidermonkey/localstorage.cpp index 59446363d..62c3d3132 100644 --- a/src/ecmascript/spidermonkey/localstorage.cpp +++ b/src/js/spidermonkey/localstorage.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "bfu/dialog.h" #include "cache/cache.h" @@ -22,13 +22,13 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/localstorage-db.h" -#include "ecmascript/spidermonkey/form.h" -#include "ecmascript/spidermonkey/location.h" -#include "ecmascript/spidermonkey/localstorage.h" -#include "ecmascript/spidermonkey/document.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/localstorage-db.h" +#include "js/spidermonkey/form.h" +#include "js/spidermonkey/location.h" +#include "js/spidermonkey/localstorage.h" +#include "js/spidermonkey/document.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/localstorage.h b/src/js/spidermonkey/localstorage.h similarity index 76% rename from src/ecmascript/spidermonkey/localstorage.h rename to src/js/spidermonkey/localstorage.h index 636446017..d5cfaef62 100644 --- a/src/ecmascript/spidermonkey/localstorage.h +++ b/src/js/spidermonkey/localstorage.h @@ -2,8 +2,8 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_LOCALSTORAGE_H #define EL__ECMASCRIPT_SPIDERMONKEY_LOCALSTORAGE_H -#include "ecmascript/spidermonkey/util.h" -#include "ecmascript/localstorage-db.h" +#include "js/spidermonkey/util.h" +#include "js/localstorage-db.h" extern const JSClass localstorage_class; extern const spidermonkeyFunctionSpec localstorage_funcs[]; diff --git a/src/ecmascript/spidermonkey/location.cpp b/src/js/spidermonkey/location.cpp similarity index 99% rename from src/ecmascript/spidermonkey/location.cpp rename to src/js/spidermonkey/location.cpp index 5ebdf80f5..7c685b18f 100644 --- a/src/ecmascript/spidermonkey/location.cpp +++ b/src/js/spidermonkey/location.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,9 +22,9 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/location.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/location.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/location.h b/src/js/spidermonkey/location.h similarity index 86% rename from src/ecmascript/spidermonkey/location.h rename to src/js/spidermonkey/location.h index d9dd64df7..fead4d02f 100644 --- a/src/ecmascript/spidermonkey/location.h +++ b/src/js/spidermonkey/location.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_LOCATION_H #define EL__ECMASCRIPT_SPIDERMONKEY_LOCATION_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass location_class; extern const spidermonkeyFunctionSpec location_funcs[]; diff --git a/src/ecmascript/spidermonkey/meson.build b/src/js/spidermonkey/meson.build similarity index 100% rename from src/ecmascript/spidermonkey/meson.build rename to src/js/spidermonkey/meson.build diff --git a/src/ecmascript/spidermonkey/message.cpp b/src/js/spidermonkey/message.cpp similarity index 98% rename from src/ecmascript/spidermonkey/message.cpp rename to src/js/spidermonkey/message.cpp index 212dd988a..6a0044723 100644 --- a/src/ecmascript/spidermonkey/message.cpp +++ b/src/js/spidermonkey/message.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,11 +23,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/message.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/message.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/message.h b/src/js/spidermonkey/message.h similarity index 90% rename from src/ecmascript/spidermonkey/message.h rename to src/js/spidermonkey/message.h index ff47401b0..6d6f56a7b 100644 --- a/src/ecmascript/spidermonkey/message.h +++ b/src/js/spidermonkey/message.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_MESSAGE_H #define EL__ECMASCRIPT_SPIDERMONKEY_MESSAGE_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass messageEvent_class; extern JSPropertySpec messageEvent_props[]; diff --git a/src/ecmascript/spidermonkey/navigator.cpp b/src/js/spidermonkey/navigator.cpp similarity index 97% rename from src/ecmascript/spidermonkey/navigator.cpp rename to src/js/spidermonkey/navigator.cpp index cf8f17086..f8c25d7e5 100644 --- a/src/ecmascript/spidermonkey/navigator.cpp +++ b/src/js/spidermonkey/navigator.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "bfu/dialog.h" #include "cache/cache.h" @@ -21,8 +21,8 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/navigator.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/navigator.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/navigator.h b/src/js/spidermonkey/navigator.h similarity index 81% rename from src/ecmascript/spidermonkey/navigator.h rename to src/js/spidermonkey/navigator.h index ac602fe9a..8775207f0 100644 --- a/src/ecmascript/spidermonkey/navigator.h +++ b/src/js/spidermonkey/navigator.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_NAVIGATOR_H #define EL__ECMASCRIPT_SPIDERMONKEY_NAVIGATOR_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass navigator_class; extern JSPropertySpec navigator_props[]; diff --git a/src/ecmascript/spidermonkey/node.cpp b/src/js/spidermonkey/node.cpp similarity index 95% rename from src/ecmascript/spidermonkey/node.cpp rename to src/js/spidermonkey/node.cpp index 05161fb0e..a53549279 100644 --- a/src/ecmascript/spidermonkey/node.cpp +++ b/src/js/spidermonkey/node.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,11 +23,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/node.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/node.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/node.h b/src/js/spidermonkey/node.h similarity index 84% rename from src/ecmascript/spidermonkey/node.h rename to src/js/spidermonkey/node.h index 8a8d8c736..552110450 100644 --- a/src/ecmascript/spidermonkey/node.h +++ b/src/js/spidermonkey/node.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_NODE_H #define EL__ECMASCRIPT_SPIDERMONKEY_NODE_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass node_class; extern JSPropertySpec node_static_props[]; diff --git a/src/ecmascript/spidermonkey/nodelist.cpp b/src/js/spidermonkey/nodelist.cpp similarity index 96% rename from src/ecmascript/spidermonkey/nodelist.cpp rename to src/js/spidermonkey/nodelist.cpp index c5c8589ab..ee0d6bdeb 100644 --- a/src/ecmascript/spidermonkey/nodelist.cpp +++ b/src/js/spidermonkey/nodelist.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -24,10 +24,10 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/nodelist.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/nodelist.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/nodelist.h b/src/js/spidermonkey/nodelist.h similarity index 78% rename from src/ecmascript/spidermonkey/nodelist.h rename to src/js/spidermonkey/nodelist.h index 6612d2984..e31e48b21 100644 --- a/src/ecmascript/spidermonkey/nodelist.h +++ b/src/js/spidermonkey/nodelist.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_NODELIST_H #define EL__ECMASCRIPT_SPIDERMONKEY_NODELIST_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getNodeList(JSContext *ctx, void *node); diff --git a/src/ecmascript/spidermonkey/nodelist2.cpp b/src/js/spidermonkey/nodelist2.cpp similarity index 94% rename from src/ecmascript/spidermonkey/nodelist2.cpp rename to src/js/spidermonkey/nodelist2.cpp index 3503d7d9c..358ea5c4a 100644 --- a/src/ecmascript/spidermonkey/nodelist2.cpp +++ b/src/js/spidermonkey/nodelist2.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -24,11 +24,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/nodelist2.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/nodelist2.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/nodelist2.h b/src/js/spidermonkey/nodelist2.h similarity index 79% rename from src/ecmascript/spidermonkey/nodelist2.h rename to src/js/spidermonkey/nodelist2.h index bc4548a5d..dd66f61fa 100644 --- a/src/ecmascript/spidermonkey/nodelist2.h +++ b/src/js/spidermonkey/nodelist2.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_NODELIST2_H #define EL__ECMASCRIPT_SPIDERMONKEY_NODELIST2_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getNodeList2(JSContext *ctx, void *result_list); diff --git a/src/ecmascript/spidermonkey/screen.cpp b/src/js/spidermonkey/screen.cpp similarity index 97% rename from src/ecmascript/spidermonkey/screen.cpp rename to src/js/spidermonkey/screen.cpp index 0badaa15d..c2b83430e 100644 --- a/src/ecmascript/spidermonkey/screen.cpp +++ b/src/js/spidermonkey/screen.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,9 +22,9 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/screen.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/screen.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/screen.h b/src/js/spidermonkey/screen.h similarity index 80% rename from src/ecmascript/spidermonkey/screen.h rename to src/js/spidermonkey/screen.h index 39ae62305..d7c032269 100644 --- a/src/ecmascript/spidermonkey/screen.h +++ b/src/js/spidermonkey/screen.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_SCREEN_H #define EL__ECMASCRIPT_SPIDERMONKEY_SCREEN_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass screen_class; extern JSPropertySpec screen_props[]; diff --git a/src/ecmascript/spidermonkey/style.cpp b/src/js/spidermonkey/style.cpp similarity index 99% rename from src/ecmascript/spidermonkey/style.cpp rename to src/js/spidermonkey/style.cpp index 20a754b0c..c6f76e31e 100644 --- a/src/ecmascript/spidermonkey/style.cpp +++ b/src/js/spidermonkey/style.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -26,9 +26,9 @@ #include "document/libdom/corestrings.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/libdom/dom.h" -#include "ecmascript/spidermonkey/style.h" +#include "js/ecmascript.h" +#include "js/libdom/dom.h" +#include "js/spidermonkey/style.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/style.h b/src/js/spidermonkey/style.h similarity index 77% rename from src/ecmascript/spidermonkey/style.h rename to src/js/spidermonkey/style.h index fda3362a0..a890f6790 100644 --- a/src/ecmascript/spidermonkey/style.h +++ b/src/js/spidermonkey/style.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_STYLE_H #define EL__ECMASCRIPT_SPIDERMONKEY_STYLE_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getStyle(JSContext *ctx, void *node); diff --git a/src/ecmascript/spidermonkey/text.cpp b/src/js/spidermonkey/text.cpp similarity index 98% rename from src/ecmascript/spidermonkey/text.cpp rename to src/js/spidermonkey/text.cpp index b1c7cd977..bb3abdc41 100644 --- a/src/ecmascript/spidermonkey/text.cpp +++ b/src/js/spidermonkey/text.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -28,23 +28,23 @@ #include "document/libdom/mapa.h" #include "document/libdom/renderer2.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/ecmascript-c.h" -#include "ecmascript/spidermonkey/attr.h" -#include "ecmascript/spidermonkey/attributes.h" -#include "ecmascript/spidermonkey/collection.h" -#include "ecmascript/spidermonkey/dataset.h" -#include "ecmascript/spidermonkey/domrect.h" -#include "ecmascript/spidermonkey/event.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/keyboard.h" -#include "ecmascript/spidermonkey/nodelist.h" -#include "ecmascript/spidermonkey/nodelist2.h" -#include "ecmascript/spidermonkey/style.h" -#include "ecmascript/spidermonkey/text.h" -#include "ecmascript/spidermonkey/tokenlist.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/ecmascript-c.h" +#include "js/spidermonkey/attr.h" +#include "js/spidermonkey/attributes.h" +#include "js/spidermonkey/collection.h" +#include "js/spidermonkey/dataset.h" +#include "js/spidermonkey/domrect.h" +#include "js/spidermonkey/event.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/keyboard.h" +#include "js/spidermonkey/nodelist.h" +#include "js/spidermonkey/nodelist2.h" +#include "js/spidermonkey/style.h" +#include "js/spidermonkey/text.h" +#include "js/spidermonkey/tokenlist.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/text.h b/src/js/spidermonkey/text.h similarity index 83% rename from src/ecmascript/spidermonkey/text.h rename to src/js/spidermonkey/text.h index 8690312a7..d8a74cfd1 100644 --- a/src/ecmascript/spidermonkey/text.h +++ b/src/js/spidermonkey/text.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_TEXT_H #define EL__ECMASCRIPT_SPIDERMONKEY_TEXT_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass text_class; extern JSPropertySpec text_props[]; diff --git a/src/ecmascript/spidermonkey/tokenlist.cpp b/src/js/spidermonkey/tokenlist.cpp similarity index 97% rename from src/ecmascript/spidermonkey/tokenlist.cpp rename to src/js/spidermonkey/tokenlist.cpp index bc16f394c..c9753bf45 100644 --- a/src/ecmascript/spidermonkey/tokenlist.cpp +++ b/src/js/spidermonkey/tokenlist.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -25,9 +25,9 @@ #include "document/forms.h" #include "document/libdom/corestrings.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/element.h" -#include "ecmascript/spidermonkey/tokenlist.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/element.h" +#include "js/spidermonkey/tokenlist.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/tokenlist.h b/src/js/spidermonkey/tokenlist.h similarity index 79% rename from src/ecmascript/spidermonkey/tokenlist.h rename to src/js/spidermonkey/tokenlist.h index b950a7111..195b2af35 100644 --- a/src/ecmascript/spidermonkey/tokenlist.h +++ b/src/js/spidermonkey/tokenlist.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_TOKENLIST_H #define EL__ECMASCRIPT_SPIDERMONKEY_TOKENLIST_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" JSObject *getTokenlist(JSContext *ctx, void *tokens); diff --git a/src/ecmascript/spidermonkey/unibar.cpp b/src/js/spidermonkey/unibar.cpp similarity index 97% rename from src/ecmascript/spidermonkey/unibar.cpp rename to src/js/spidermonkey/unibar.cpp index c1aca8873..0362d975e 100644 --- a/src/ecmascript/spidermonkey/unibar.cpp +++ b/src/js/spidermonkey/unibar.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include "bfu/dialog.h" @@ -22,9 +22,9 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/unibar.h" -#include "ecmascript/spidermonkey/window.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/unibar.h" +#include "js/spidermonkey/window.h" #include "intl/libintl.h" #include "main/select.h" #include "osdep/newwin.h" diff --git a/src/ecmascript/spidermonkey/unibar.h b/src/js/spidermonkey/unibar.h similarity index 82% rename from src/ecmascript/spidermonkey/unibar.h rename to src/js/spidermonkey/unibar.h index 766be9a49..ba004da8f 100644 --- a/src/ecmascript/spidermonkey/unibar.h +++ b/src/js/spidermonkey/unibar.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_UNIBAR_H #define EL__ECMASCRIPT_SPIDERMONKEY_UNIBAR_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass menubar_class; extern JSClass statusbar_class; diff --git a/src/ecmascript/spidermonkey/url.cpp b/src/js/spidermonkey/url.cpp similarity index 99% rename from src/ecmascript/spidermonkey/url.cpp rename to src/js/spidermonkey/url.cpp index fa04fe6ca..619d11b7f 100644 --- a/src/ecmascript/spidermonkey/url.cpp +++ b/src/js/spidermonkey/url.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,11 +23,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/url.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/url.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/url.h b/src/js/spidermonkey/url.h similarity index 86% rename from src/ecmascript/spidermonkey/url.h rename to src/js/spidermonkey/url.h index d0bcc5175..eec06e5ec 100644 --- a/src/ecmascript/spidermonkey/url.h +++ b/src/js/spidermonkey/url.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_URL_H #define EL__ECMASCRIPT_SPIDERMONKEY_URL_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass url_class; extern JSPropertySpec url_props[]; diff --git a/src/ecmascript/spidermonkey/urlsearchparams.cpp b/src/js/spidermonkey/urlsearchparams.cpp similarity index 98% rename from src/ecmascript/spidermonkey/urlsearchparams.cpp rename to src/js/spidermonkey/urlsearchparams.cpp index 50ee38bd0..95b5b2d41 100644 --- a/src/ecmascript/spidermonkey/urlsearchparams.cpp +++ b/src/js/spidermonkey/urlsearchparams.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include #include @@ -26,11 +26,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/urlsearchparams.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/urlsearchparams.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/urlsearchparams.h b/src/js/spidermonkey/urlsearchparams.h similarity index 89% rename from src/ecmascript/spidermonkey/urlsearchparams.h rename to src/js/spidermonkey/urlsearchparams.h index 12b6a2624..224517470 100644 --- a/src/ecmascript/spidermonkey/urlsearchparams.h +++ b/src/js/spidermonkey/urlsearchparams.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_URLSEARCHPARAMS_H #define EL__ECMASCRIPT_SPIDERMONKEY_URLSEARCHPARAMS_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass urlSearchParams_class; extern JSPropertySpec urlSearchParams_props[]; diff --git a/src/ecmascript/spidermonkey/util.h b/src/js/spidermonkey/util.h similarity index 96% rename from src/ecmascript/spidermonkey/util.h rename to src/js/spidermonkey/util.h index b7360502f..d1b14db6a 100644 --- a/src/ecmascript/spidermonkey/util.h +++ b/src/js/spidermonkey/util.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_UTIL_H #define EL__ECMASCRIPT_SPIDERMONKEY_UTIL_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "util/memory.h" static void string_to_jsval(JSContext *ctx, JS::Value *vp, char *string); diff --git a/src/ecmascript/spidermonkey/window.cpp b/src/js/spidermonkey/window.cpp similarity index 98% rename from src/ecmascript/spidermonkey/window.cpp rename to src/js/spidermonkey/window.cpp index 07db1a344..f069974b1 100644 --- a/src/ecmascript/spidermonkey/window.cpp +++ b/src/js/spidermonkey/window.cpp @@ -10,9 +10,9 @@ #include "elinks.h" -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -25,14 +25,14 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey/css.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/keyboard.h" -#include "ecmascript/spidermonkey/location.h" -#include "ecmascript/spidermonkey/message.h" -#include "ecmascript/spidermonkey/window.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey/css.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/keyboard.h" +#include "js/spidermonkey/location.h" +#include "js/spidermonkey/message.h" +#include "js/spidermonkey/window.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/window.h b/src/js/spidermonkey/window.h similarity index 84% rename from src/ecmascript/spidermonkey/window.h rename to src/js/spidermonkey/window.h index e927b833b..233c3d062 100644 --- a/src/ecmascript/spidermonkey/window.h +++ b/src/js/spidermonkey/window.h @@ -2,7 +2,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_WINDOW_H #define EL__ECMASCRIPT_SPIDERMONKEY_WINDOW_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass window_class; extern JSPropertySpec window_props[]; diff --git a/src/ecmascript/spidermonkey/xhr.cpp b/src/js/spidermonkey/xhr.cpp similarity index 99% rename from src/ecmascript/spidermonkey/xhr.cpp rename to src/js/spidermonkey/xhr.cpp index 9493d9741..6a0160cc6 100644 --- a/src/ecmascript/spidermonkey/xhr.cpp +++ b/src/js/spidermonkey/xhr.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include #include @@ -23,11 +23,11 @@ #include "document/document.h" #include "document/forms.h" #include "document/view.h" -#include "ecmascript/ecmascript.h" -#include "ecmascript/spidermonkey.h" -#include "ecmascript/spidermonkey/heartbeat.h" -#include "ecmascript/spidermonkey/xhr.h" -#include "ecmascript/timer.h" +#include "js/ecmascript.h" +#include "js/spidermonkey.h" +#include "js/spidermonkey/heartbeat.h" +#include "js/spidermonkey/xhr.h" +#include "js/timer.h" #include "intl/libintl.h" #include "main/select.h" #include "main/timer.h" diff --git a/src/ecmascript/spidermonkey/xhr.h b/src/js/spidermonkey/xhr.h similarity index 88% rename from src/ecmascript/spidermonkey/xhr.h rename to src/js/spidermonkey/xhr.h index 68f8110a7..470f4dfe7 100644 --- a/src/ecmascript/spidermonkey/xhr.h +++ b/src/js/spidermonkey/xhr.h @@ -1,7 +1,7 @@ #ifndef EL__ECMASCRIPT_SPIDERMONKEY_XHR_H #define EL__ECMASCRIPT_SPIDERMONKEY_XHR_H -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" extern JSClass xhr_class; extern JSPropertySpec xhr_props[]; diff --git a/src/ecmascript/timer.c b/src/js/timer.c similarity index 97% rename from src/ecmascript/timer.c rename to src/js/timer.c index 7f72ff1a6..97f764f5d 100644 --- a/src/ecmascript/timer.c +++ b/src/js/timer.c @@ -9,7 +9,7 @@ #include "elinks.h" -#include "ecmascript/timer.h" +#include "js/timer.h" #include "util/hash.h" #include "util/string.h" diff --git a/src/ecmascript/timer.h b/src/js/timer.h similarity index 100% rename from src/ecmascript/timer.h rename to src/js/timer.h diff --git a/src/main/module.c b/src/main/module.c index 124cc192d..eccfa05ac 100644 --- a/src/main/module.c +++ b/src/main/module.c @@ -22,7 +22,7 @@ #include "document/css/css.h" #include "document/document.h" #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_MUJS) || defined(CONFIG_QUICKJS) -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "formhist/formhist.h" #include "globhist/globhist.h" diff --git a/src/main/timer.c b/src/main/timer.c index 800ada873..93b773241 100644 --- a/src/main/timer.c +++ b/src/main/timer.c @@ -34,7 +34,7 @@ #include "util/time.h" #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) -#include "ecmascript/timer.h" +#include "js/timer.h" #endif /* @timers.next points to the timer with the smallest interval, diff --git a/src/meson.build b/src/meson.build index 4928e013e..b92087213 100644 --- a/src/meson.build +++ b/src/meson.build @@ -8,7 +8,7 @@ if conf_data.get('CONFIG_DOM') subdir('dom') endif if conf_data.get('CONFIG_ECMASCRIPT') - subdir('ecmascript') + subdir('js') endif if conf_data.get('CONFIG_FORMHIST') subdir('formhist') diff --git a/src/osdep/dos/dos.c b/src/osdep/dos/dos.c index 88d997e22..19b1da484 100644 --- a/src/osdep/dos/dos.c +++ b/src/osdep/dos/dos.c @@ -25,7 +25,7 @@ #include #include #ifdef CONFIG_QUICKJS -#include "ecmascript/quickjs/heartbeat.h" +#include "js/quickjs/heartbeat.h" #endif #include "intl/libintl.h" #include "main/main.h" diff --git a/src/protocol/protocol.c b/src/protocol/protocol.c index b8e79a0e5..e0dbed988 100644 --- a/src/protocol/protocol.c +++ b/src/protocol/protocol.c @@ -13,7 +13,7 @@ #include "document/view.h" #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "intl/libintl.h" diff --git a/src/scripting/smjs/action_object.cpp b/src/scripting/smjs/action_object.cpp index e3bee0eec..cc8a5a242 100644 --- a/src/scripting/smjs/action_object.cpp +++ b/src/scripting/smjs/action_object.cpp @@ -7,7 +7,7 @@ #include "elinks.h" #include "config/kbdbind.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "intl/libintl.h" #include "scripting/smjs/core.h" #include "scripting/smjs/elinks_object.h" diff --git a/src/scripting/smjs/bookmarks.cpp b/src/scripting/smjs/bookmarks.cpp index 3e05f85ec..8130e7da1 100644 --- a/src/scripting/smjs/bookmarks.cpp +++ b/src/scripting/smjs/bookmarks.cpp @@ -7,7 +7,7 @@ #include "elinks.h" #include "bookmarks/bookmarks.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "intl/charsets.h" #include "main/event.h" #include "scripting/smjs/core.h" diff --git a/src/scripting/smjs/bookmarks.h b/src/scripting/smjs/bookmarks.h index 16f1ec4d4..bb058b9ef 100644 --- a/src/scripting/smjs/bookmarks.h +++ b/src/scripting/smjs/bookmarks.h @@ -1,7 +1,7 @@ #ifndef EL__SCRIPTING_SMJS_BOOKMARKS_H #define EL__SCRIPTING_SMJS_BOOKMARKS_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" void smjs_init_bookmarks_interface(void); diff --git a/src/scripting/smjs/cache_object.cpp b/src/scripting/smjs/cache_object.cpp index 1943c01a5..fb8258bbf 100644 --- a/src/scripting/smjs/cache_object.cpp +++ b/src/scripting/smjs/cache_object.cpp @@ -7,7 +7,7 @@ #include "elinks.h" #include "cache/cache.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "protocol/uri.h" #include "scripting/smjs/cache_object.h" #include "scripting/smjs/core.h" diff --git a/src/scripting/smjs/core.cpp b/src/scripting/smjs/core.cpp index e22a91d09..4932b37f4 100644 --- a/src/scripting/smjs/core.cpp +++ b/src/scripting/smjs/core.cpp @@ -9,7 +9,7 @@ #include "elinks.h" #include "config/home.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include #include "intl/charsets.h" #include "main/module.h" diff --git a/src/scripting/smjs/core.h b/src/scripting/smjs/core.h index 573b698ca..6fdbd78d9 100644 --- a/src/scripting/smjs/core.h +++ b/src/scripting/smjs/core.h @@ -1,7 +1,7 @@ #ifndef EL__SCRIPTING_SMJS_CORE_H #define EL__SCRIPTING_SMJS_CORE_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" struct module; struct session; diff --git a/src/scripting/smjs/elinks_object.cpp b/src/scripting/smjs/elinks_object.cpp index 1860b2c2c..52cedd408 100644 --- a/src/scripting/smjs/elinks_object.cpp +++ b/src/scripting/smjs/elinks_object.cpp @@ -10,8 +10,8 @@ #include "bfu/msgbox.h" #include "config/home.h" -#include "ecmascript/spidermonkey-shared.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey-shared.h" +#include "js/spidermonkey/util.h" #include "intl/libintl.h" #include "protocol/uri.h" #include "scripting/scripting.h" diff --git a/src/scripting/smjs/elinks_object.h b/src/scripting/smjs/elinks_object.h index be8c00f2b..a25d2efa6 100644 --- a/src/scripting/smjs/elinks_object.h +++ b/src/scripting/smjs/elinks_object.h @@ -1,7 +1,7 @@ #ifndef EL__SCRIPTING_SMJS_ELINKS_OBJECT_H #define EL__SCRIPTING_SMJS_ELINKS_OBJECT_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" /* This is the all-powerful elinks object through which all client scripts * will interface with ELinks. */ diff --git a/src/scripting/smjs/global_object.cpp b/src/scripting/smjs/global_object.cpp index 29e18a26c..469dab3e3 100644 --- a/src/scripting/smjs/global_object.cpp +++ b/src/scripting/smjs/global_object.cpp @@ -6,7 +6,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "scripting/scripting.h" #include "scripting/smjs/core.h" #include "scripting/smjs/global_object.h" diff --git a/src/scripting/smjs/global_object.h b/src/scripting/smjs/global_object.h index c2c7df914..0fea62a23 100644 --- a/src/scripting/smjs/global_object.h +++ b/src/scripting/smjs/global_object.h @@ -1,7 +1,7 @@ #ifndef EL__SCRIPTING_SMJS_GLOBAL_OBJECT_H #define EL__SCRIPTING_SMJS_GLOBAL_OBJECT_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" /* The root of the object hierarchy. If object 'foo' has this as its parent, * you can use foo's method and properties with 'foo.'. */ diff --git a/src/scripting/smjs/globhist.cpp b/src/scripting/smjs/globhist.cpp index f9de31611..ccfc36d13 100644 --- a/src/scripting/smjs/globhist.cpp +++ b/src/scripting/smjs/globhist.cpp @@ -7,7 +7,7 @@ #include "elinks.h" #include "globhist/globhist.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "scripting/smjs/core.h" #include "scripting/smjs/elinks_object.h" #include "util/memory.h" diff --git a/src/scripting/smjs/hooks.cpp b/src/scripting/smjs/hooks.cpp index b5d2efd95..8f9e7947b 100644 --- a/src/scripting/smjs/hooks.cpp +++ b/src/scripting/smjs/hooks.cpp @@ -7,7 +7,7 @@ #include "elinks.h" #include "cache/cache.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "protocol/uri.h" #include "main/event.h" #include "main/module.h" diff --git a/src/scripting/smjs/keybinding.cpp b/src/scripting/smjs/keybinding.cpp index b41ad13ad..71ad4acd6 100644 --- a/src/scripting/smjs/keybinding.cpp +++ b/src/scripting/smjs/keybinding.cpp @@ -7,7 +7,7 @@ #include "elinks.h" #include "config/kbdbind.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "main/event.h" #include "scripting/smjs/core.h" #include "scripting/smjs/elinks_object.h" diff --git a/src/scripting/smjs/keybinding.h b/src/scripting/smjs/keybinding.h index 2f2893a2a..bc9bac290 100644 --- a/src/scripting/smjs/keybinding.h +++ b/src/scripting/smjs/keybinding.h @@ -1,7 +1,7 @@ #ifndef EL__SCRIPTING_SMJS_KEYBINDING_H #define EL__SCRIPTING_SMJS_KEYBINDING_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" void smjs_init_keybinding_interface(void); diff --git a/src/scripting/smjs/load_uri.cpp b/src/scripting/smjs/load_uri.cpp index 8350b58c3..554e2534a 100644 --- a/src/scripting/smjs/load_uri.cpp +++ b/src/scripting/smjs/load_uri.cpp @@ -6,7 +6,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "network/connection.h" #include "protocol/uri.h" #include "protocol/protocol.h" diff --git a/src/scripting/smjs/session_object.cpp b/src/scripting/smjs/session_object.cpp index 3945183c6..e95c57fe7 100644 --- a/src/scripting/smjs/session_object.cpp +++ b/src/scripting/smjs/session_object.cpp @@ -10,7 +10,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "main/select.h" #include "protocol/uri.h" #include "scripting/smjs/core.h" diff --git a/src/scripting/smjs/session_object.h b/src/scripting/smjs/session_object.h index b022ef9d2..43c051c4e 100644 --- a/src/scripting/smjs/session_object.h +++ b/src/scripting/smjs/session_object.h @@ -1,7 +1,7 @@ #ifndef EL__SCRIPTING_SMJS_SESSION_OBJECT_H #define EL__SCRIPTING_SMJS_SESSION_OBJECT_H -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" struct session; struct terminal; diff --git a/src/scripting/smjs/terminal_object.cpp b/src/scripting/smjs/terminal_object.cpp index fb48b179e..e13a1ee8f 100644 --- a/src/scripting/smjs/terminal_object.cpp +++ b/src/scripting/smjs/terminal_object.cpp @@ -8,7 +8,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey/util.h" +#include "js/spidermonkey/util.h" #include "scripting/smjs/core.h" #include "scripting/smjs/elinks_object.h" #include "scripting/smjs/session_object.h" diff --git a/src/scripting/smjs/view_state_object.cpp b/src/scripting/smjs/view_state_object.cpp index 7a3de8566..6a1612c8c 100644 --- a/src/scripting/smjs/view_state_object.cpp +++ b/src/scripting/smjs/view_state_object.cpp @@ -8,7 +8,7 @@ #include "elinks.h" -#include "ecmascript/spidermonkey-shared.h" +#include "js/spidermonkey-shared.h" #include "protocol/uri.h" #include "scripting/smjs/core.h" #include "scripting/smjs/elinks_object.h" diff --git a/src/viewer/action.c b/src/viewer/action.c index 62a2a7110..a880ae990 100644 --- a/src/viewer/action.c +++ b/src/viewer/action.c @@ -26,7 +26,7 @@ #include "document/document.h" #include "document/view.h" #ifdef CONFIG_ECMASCRIPT -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "formhist/dialogs.h" #include "globhist/dialogs.h" diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c index fa3e03b59..3408b7e87 100644 --- a/src/viewer/text/form.c +++ b/src/viewer/text/form.c @@ -32,7 +32,7 @@ #include "document/view.h" #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "intl/libintl.h" diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c index af27885c8..24f4047f2 100644 --- a/src/viewer/text/link.c +++ b/src/viewer/text/link.c @@ -10,7 +10,7 @@ #include "elinks.h" #ifdef CONFIG_LIBDOM -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" #include #include #endif @@ -28,7 +28,7 @@ #include "document/view.h" #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "intl/libintl.h" diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c index e5a15efbe..6b7205132 100644 --- a/src/viewer/text/view.c +++ b/src/viewer/text/view.c @@ -14,7 +14,7 @@ #include "elinks.h" #ifdef CONFIG_LIBDOM -#include "ecmascript/libdom/dom.h" +#include "js/libdom/dom.h" #include #include #endif @@ -36,7 +36,7 @@ #if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) #include "document/libdom/mapa.h" -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "intl/charsets.h" diff --git a/src/viewer/text/vs.c b/src/viewer/text/vs.c index cec094986..b56194cb9 100644 --- a/src/viewer/text/vs.c +++ b/src/viewer/text/vs.c @@ -13,7 +13,7 @@ #include "document/document.h" #include "document/view.h" #ifdef CONFIG_ECMASCRIPT -#include "ecmascript/ecmascript-c.h" +#include "js/ecmascript-c.h" #endif #include "protocol/uri.h" #ifdef CONFIG_SCRIPTING_SPIDERMONKEY