diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-01-28 11:14:15 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2020-01-28 11:14:42 +0100 |
| commit | b60b4790d1b1b8d52657c0c9ba91da86d0b8a28d (patch) | |
| tree | dc247cd284afafbc642a5405dfb4608b4ad0c109 /modules/luci-base | |
| parent | 8c860a1d9cf4229419d0cc2eed99a1c001cf16c5 (diff) | |
luci-base: add L.media() URL construction helper
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base')
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/luci.js | 22 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/header.htm | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js index 3a8c6b4b1..3b861bfc1 100644 --- a/modules/luci-base/htdocs/luci-static/resources/luci.js +++ b/modules/luci-base/htdocs/luci-static/resources/luci.js @@ -1751,6 +1751,28 @@ }, /** + * Construct an URL path relative to the media resource path of the + * LuCI ui (usually `/luci-static/$theme_name`). + * + * The resulting URL is guaranteed to only contain the characters + * `a-z`, `A-Z`, `0-9`, `_`, `.`, `%`, `,`, `;`, and `-` as well + * as `/` for the path separator. + * + * @instance + * @memberof LuCI + * + * @param {string[]} [parts] + * An array of parts to join into an URL path. Parts may contain + * slashes and any of the other characters mentioned above. + * + * @return {string} + * Returns the resulting URL path. + */ + media: function() { + return this.path(this.env.media, arguments); + }, + + /** * Return the complete URL path to the current view. * * @instance diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm index 6f7f0e48e..fbede8ff5 100644 --- a/modules/luci-base/luasrc/view/header.htm +++ b/modules/luci-base/luasrc/view/header.htm @@ -18,6 +18,7 @@ <script type="text/javascript"> L = new LuCI(<%= luci.http.write_json({ token = token, + media = media, resource = resource, scriptname = luci.http.getenv("SCRIPT_NAME"), pathinfo = luci.http.getenv("PATH_INFO"), |