diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2020-02-07 16:36:00 +0200 |
|---|---|---|
| committer | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2020-02-07 18:20:33 +0200 |
| commit | 68a1b47d4d4a7d59d4f43850902d4194eb7c0552 (patch) | |
| tree | 930dbaf8c35c75e748f314b562a80f957d59e027 /player/javascript | |
| parent | 10a97f7cc3e3884c2fcb3981a7bc208d0f846b05 (diff) | |
| download | mpv-68a1b47d4d4a7d59d4f43850902d4194eb7c0552.tar.bz2 mpv-68a1b47d4d4a7d59d4f43850902d4194eb7c0552.tar.xz | |
js: require: don't use ~~/scripts/modules.js/
Directories inside ~~/scripts/ are now loaded as scripts, so don't use
it also for modules. Now there are no default module paths.
To compensate, we now try to run ~~/.init.js right after defaults.js,
so the user may extend the js init procedure via this script, e.g. for
adding default paths to mp.module_paths .
Diffstat (limited to 'player/javascript')
| -rw-r--r-- | player/javascript/defaults.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/player/javascript/defaults.js b/player/javascript/defaults.js index 0a1c99bcef..588e8d6891 100644 --- a/player/javascript/defaults.js +++ b/player/javascript/defaults.js @@ -462,7 +462,7 @@ function process_timers() { - Module id supports mpv path enhancements, e.g. ~/foo, ~~/bar, ~~desktop/baz *********************************************************************/ -mp.module_paths = ["~~/scripts/modules.js"]; // global modules search paths +mp.module_paths = []; // global modules search paths // Internal meta top-dirs. Users should not rely on these names. var MODULES_META = "~~modules", @@ -740,3 +740,8 @@ g.mp_event_loop = function mp_event_loop() { }; })(this) + +try { + // let the user extend us, e.g. for updating mp.module_paths + require("~~/.init"); +} catch(e) {} |