diff --git a/src/_h5ai/public/js/lib/ext/contextmenu.js b/src/_h5ai/public/js/lib/ext/contextmenu.js index 76f94e53..92ebb897 100644 --- a/src/_h5ai/public/js/lib/ext/contextmenu.js +++ b/src/_h5ai/public/js/lib/ext/contextmenu.js @@ -1,9 +1,10 @@ -const {win, jq, lo} = require('../globals'); +const {each} = require('../lo'); +const {win, jq} = require('../globals'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); const doc = win.document; -const settings = lo.extend({ +const settings = Object.assign({ enabled: false }, allsettings.contextmenu); const templateOverlay = '
'; @@ -37,7 +38,7 @@ function createPanel(menu) { const $ul = $panel.find('ul'); let $li; - lo.each(menu, entry => { + each(menu, entry => { if (entry.type === '-') { jq(templateSep).appendTo($ul); } else if (entry.type === 'l') { diff --git a/src/_h5ai/public/js/lib/ext/crumb.js b/src/_h5ai/public/js/lib/ext/crumb.js index 5e75fafd..6ed2ad57 100644 --- a/src/_h5ai/public/js/lib/ext/crumb.js +++ b/src/_h5ai/public/js/lib/ext/crumb.js @@ -1,4 +1,5 @@ -const {jq, lo} = require('../globals'); +const {each} = require('../lo'); +const {jq} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); @@ -6,7 +7,7 @@ const allsettings = require('../core/settings'); const base = require('../view/base'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false }, allsettings.crumb); const crumbTemplate = @@ -46,7 +47,7 @@ function onLocationChanged(item) { $crumb.addClass('active'); } else { $crumbbar.empty(); - lo.each(item.getCrumb(), crumbItem => { + each(item.getCrumb(), crumbItem => { $crumbbar.append(createHtml(crumbItem)); }); } diff --git a/src/_h5ai/public/js/lib/ext/custom.js b/src/_h5ai/public/js/lib/ext/custom.js index e91da71f..cbe61b69 100644 --- a/src/_h5ai/public/js/lib/ext/custom.js +++ b/src/_h5ai/public/js/lib/ext/custom.js @@ -1,10 +1,10 @@ -const {jq, lo, marked} = require('../globals'); +const {jq, marked} = require('../globals'); const server = require('../server'); const event = require('../core/event'); const allsettings = require('../core/settings'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false }, allsettings.custom); let $header; diff --git a/src/_h5ai/public/js/lib/ext/download.js b/src/_h5ai/public/js/lib/ext/download.js index b96fe439..72e29899 100644 --- a/src/_h5ai/public/js/lib/ext/download.js +++ b/src/_h5ai/public/js/lib/ext/download.js @@ -1,11 +1,12 @@ -const {jq, lo} = require('../globals'); +const {each} = require('../lo'); +const {jq} = require('../globals'); const server = require('../server'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false, type: 'php-tar', packageName: 'package', @@ -48,7 +49,7 @@ function onClick() { baseHref: location.getAbsHref() }; - lo.each(selectedItems, (item, idx) => { + each(selectedItems, (item, idx) => { query['hrefs[' + idx + ']'] = item.absHref; }); diff --git a/src/_h5ai/public/js/lib/ext/filter.js b/src/_h5ai/public/js/lib/ext/filter.js index 9c975d18..03dcf87e 100644 --- a/src/_h5ai/public/js/lib/ext/filter.js +++ b/src/_h5ai/public/js/lib/ext/filter.js @@ -1,4 +1,5 @@ -const {jq, lo} = require('../globals'); +const {each, debounce} = require('../lo'); +const {jq} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); @@ -7,7 +8,7 @@ const util = require('../core/util'); const view = require('../view/view'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false, advanced: false, debounceTime: 100, @@ -41,7 +42,7 @@ function filter(pattern) { const re = new RegExp(pattern, settings.ignorecase ? 'i' : ''); const matchedItems = []; - lo.each(location.getItem().content, item => { + each(location.getItem().content, item => { if (re.test(item.label)) { matchedItems.push(item); } @@ -83,7 +84,7 @@ function init() { $input = $filter.find('input'); $filter.on('click', 'img', toggle); - $input.on('keyup', lo.debounce(update, settings.debounceTime, {trailing: true})); + $input.on('keyup', debounce(update, settings.debounceTime, {trailing: true})); event.sub('location.changed', reset); } diff --git a/src/_h5ai/public/js/lib/ext/google-analytics.js b/src/_h5ai/public/js/lib/ext/google-analytics.js index 8d838ebe..edc2a3e8 100644 --- a/src/_h5ai/public/js/lib/ext/google-analytics.js +++ b/src/_h5ai/public/js/lib/ext/google-analytics.js @@ -1,9 +1,10 @@ -const {win, lo} = require('../globals'); +const {map} = require('../lo'); +const {win} = require('../globals'); const event = require('../core/event'); const allsettings = require('../core/settings'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false, id: 'UA-000000-0' }, allsettings['google-analytics-ua']); @@ -30,7 +31,7 @@ function init() { const loc = win.location; win.ga('send', 'pageview', { location: loc.protocol + '//' + loc.host + item.absHref, - title: lo.map(item.getCrumb(), 'label').join(' > ') + title: map(item.getCrumb(), i => i.label).join(' > ') }); }); } diff --git a/src/_h5ai/public/js/lib/ext/info.js b/src/_h5ai/public/js/lib/ext/info.js index 7bed10bd..68363440 100644 --- a/src/_h5ai/public/js/lib/ext/info.js +++ b/src/_h5ai/public/js/lib/ext/info.js @@ -1,4 +1,5 @@ -const {win, jq, lo, kjua} = require('../globals'); +const {isNum} = require('../lo'); +const {win, jq, kjua} = require('../globals'); const event = require('../core/event'); const format = require('../core/format'); const resource = require('../core/resource'); @@ -6,7 +7,7 @@ const allsettings = require('../core/settings'); const store = require('../core/store'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false, show: false, qrcode: true, @@ -71,13 +72,13 @@ function update(item) { } $label.text(item.label); - if (lo.isNumber(item.time)) { + if (isNum(item.time)) { $time.text(format.formatDate(item.time)); } else { $time.text('.'); } - if (lo.isNumber(item.size)) { + if (isNum(item.size)) { $size.text(format.formatSize(item.size)); $size.show(); } else { diff --git a/src/_h5ai/public/js/lib/ext/l10n.js b/src/_h5ai/public/js/lib/ext/l10n.js index 7ba8efe6..ca5e6258 100644 --- a/src/_h5ai/public/js/lib/ext/l10n.js +++ b/src/_h5ai/public/js/lib/ext/l10n.js @@ -1,4 +1,5 @@ -const {win, jq, lo} = require('../globals'); +const {keys, isStr} = require('../lo'); +const {win, jq} = require('../globals'); const server = require('../server'); const event = require('../core/event'); const format = require('../core/format'); @@ -6,7 +7,7 @@ const langs = require('../core/langs'); const allsettings = require('../core/settings'); const store = require('../core/store'); -const settings = lo.extend({ +const settings = Object.assign({ enabled: false, lang: 'en', useBrowserLang: true @@ -44,7 +45,7 @@ const blockTemplate = const optionTemplate = '