diff --git a/ghu.js b/ghu.js index 9bef5e0a..a2419650 100644 --- a/ghu.js +++ b/ghu.js @@ -68,7 +68,7 @@ ghu.task('build:scripts', runtime => { return read(`${SRC}/_h5ai/public/js/scripts.js`) .then(newerThan(mapper, `${SRC}/_h5ai/public/js/**`)) - .then(webpack(webpackConfig, {showStats: true})) + .then(webpack(webpackConfig, {showStats: false})) .then(wrap('\n\n// @include "global.js"\n\n')) .then(includeit()) .then(ife(() => runtime.args.production, uglify())) diff --git a/src/_h5ai/public/js/global.js b/src/_h5ai/public/js/global.js index 020b63b5..64970ccd 100644 --- a/src/_h5ai/public/js/global.js +++ b/src/_h5ai/public/js/global.js @@ -1,6 +1,5 @@ -(function check(win) { - /* eslint-disable func-names,no-console,no-var */ - +/* eslint-disable func-names,no-var */ +(function (win) { if (typeof win !== 'object' || win.window !== win || !win.document) { throw new Error('no-window'); } @@ -14,7 +13,6 @@ docEl.className = noBrowser; throw new Error(noBrowser + ': ' + msg); } - win.console.log('checked: ' + msg); } assert('console', win.console && typeof win.console.log === 'function'); @@ -37,9 +35,8 @@ return false; } }())); - - /* eslint-enable no-var */ }(this)); +/* eslint-enable */ // @include "vendor/*.js" diff --git a/src/_h5ai/public/js/lib/config.js b/src/_h5ai/public/js/lib/config.js index a624c613..9614a9f8 100644 --- a/src/_h5ai/public/js/lib/config.js +++ b/src/_h5ai/public/js/lib/config.js @@ -1,9 +1,9 @@ const {request} = require('./core/server'); const config = module.exports = { - _update: data => { - return request(data).then(newConfig => { - Object.assign(config, newConfig); + _update: query => { + return request(query).then(response => { + Object.assign(config, response); return config; }); } diff --git a/src/_h5ai/public/js/lib/core/event.js b/src/_h5ai/public/js/lib/core/event.js index 6dc67b0b..655e385a 100644 --- a/src/_h5ai/public/js/lib/core/event.js +++ b/src/_h5ai/public/js/lib/core/event.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); const subscriptions = {}; diff --git a/src/_h5ai/public/js/lib/core/format.js b/src/_h5ai/public/js/lib/core/format.js index 5eab78b4..1bb52f69 100644 --- a/src/_h5ai/public/js/lib/core/format.js +++ b/src/_h5ai/public/js/lib/core/format.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); const decimalMetric = { t: 1000.0, diff --git a/src/_h5ai/public/js/lib/core/langs.js b/src/_h5ai/public/js/lib/core/langs.js index b78bfcd5..1a2f8435 100644 --- a/src/_h5ai/public/js/lib/core/langs.js +++ b/src/_h5ai/public/js/lib/core/langs.js @@ -1,2 +1,2 @@ -const config = require('../config'); -module.exports = Object.assign({}, config.langs); +const {langs} = require('../config'); +module.exports = Object.assign({}, langs); diff --git a/src/_h5ai/public/js/lib/core/location.js b/src/_h5ai/public/js/lib/core/location.js index 8c2f0d94..893f555d 100644 --- a/src/_h5ai/public/js/lib/core/location.js +++ b/src/_h5ai/public/js/lib/core/location.js @@ -1,11 +1,11 @@ -const {window: win, document: doc, _: lo} = require('../win'); +const {win, lo} = require('../globals'); const {request} = require('./server'); const allsettings = require('./settings'); const event = require('./event'); const notification = require('../view/notification'); - +const doc = win.document; const settings = lo.extend({ fastBrowsing: true, unmanagedInNewWindow: true diff --git a/src/_h5ai/public/js/lib/core/resource.js b/src/_h5ai/public/js/lib/core/resource.js index 785d5719..6b9fda7f 100644 --- a/src/_h5ai/public/js/lib/core/resource.js +++ b/src/_h5ai/public/js/lib/core/resource.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); const config = require('../config'); const settings = require('./settings'); diff --git a/src/_h5ai/public/js/lib/core/server.js b/src/_h5ai/public/js/lib/core/server.js index 473c9377..ebcf302c 100644 --- a/src/_h5ai/public/js/lib/core/server.js +++ b/src/_h5ai/public/js/lib/core/server.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); function request(data) { return new Promise(resolve => { diff --git a/src/_h5ai/public/js/lib/core/store.js b/src/_h5ai/public/js/lib/core/store.js index be29705c..eae92a12 100644 --- a/src/_h5ai/public/js/lib/core/store.js +++ b/src/_h5ai/public/js/lib/core/store.js @@ -1,4 +1,4 @@ -const win = require('../win'); +const {win} = require('../globals'); const store = win.localStorage; const storekey = '_h5ai'; diff --git a/src/_h5ai/public/js/lib/core/types.js b/src/_h5ai/public/js/lib/core/types.js index 88cf51dc..ca1a9fe1 100644 --- a/src/_h5ai/public/js/lib/core/types.js +++ b/src/_h5ai/public/js/lib/core/types.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); const config = require('../config'); const reEndsWithSlash = /\/$/; diff --git a/src/_h5ai/public/js/lib/core/util.js b/src/_h5ai/public/js/lib/core/util.js index 48682a03..4161a564 100644 --- a/src/_h5ai/public/js/lib/core/util.js +++ b/src/_h5ai/public/js/lib/core/util.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); function regularCmpFn(val1, val2) { if (val1 < val2) { diff --git a/src/_h5ai/public/js/lib/ext/autorefresh.js b/src/_h5ai/public/js/lib/ext/autorefresh.js index b407e33b..3f4c485b 100644 --- a/src/_h5ai/public/js/lib/ext/autorefresh.js +++ b/src/_h5ai/public/js/lib/ext/autorefresh.js @@ -1,4 +1,4 @@ -const {setTimeout} = require('../win'); +const {win} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const allsettings = require('../core/settings'); @@ -16,12 +16,12 @@ function heartbeat() { } function before() { - clearTimeout(timeoutId); + win.clearTimeout(timeoutId); } function after() { - clearTimeout(timeoutId); - timeoutId = setTimeout(heartbeat, settings.interval); + win.clearTimeout(timeoutId); + timeoutId = win.setTimeout(heartbeat, settings.interval); } function init() { diff --git a/src/_h5ai/public/js/lib/ext/contextmenu.js b/src/_h5ai/public/js/lib/ext/contextmenu.js index 4173b5a7..76f94e53 100644 --- a/src/_h5ai/public/js/lib/ext/contextmenu.js +++ b/src/_h5ai/public/js/lib/ext/contextmenu.js @@ -1,7 +1,8 @@ -const {document: doc, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); +const doc = win.document; const settings = lo.extend({ enabled: false }, allsettings.contextmenu); diff --git a/src/_h5ai/public/js/lib/ext/crumb.js b/src/_h5ai/public/js/lib/ext/crumb.js index 6d7f2f6e..728d82b2 100644 --- a/src/_h5ai/public/js/lib/ext/crumb.js +++ b/src/_h5ai/public/js/lib/ext/crumb.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); diff --git a/src/_h5ai/public/js/lib/ext/custom.js b/src/_h5ai/public/js/lib/ext/custom.js index 7ffbfc2c..77d791bc 100644 --- a/src/_h5ai/public/js/lib/ext/custom.js +++ b/src/_h5ai/public/js/lib/ext/custom.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo, marked} = require('../win'); +const {jq, lo, marked} = require('../globals'); const event = require('../core/event'); const server = require('../core/server'); const allsettings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/ext/download.js b/src/_h5ai/public/js/lib/ext/download.js index c91540a1..81b10eaa 100644 --- a/src/_h5ai/public/js/lib/ext/download.js +++ b/src/_h5ai/public/js/lib/ext/download.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); diff --git a/src/_h5ai/public/js/lib/ext/filter.js b/src/_h5ai/public/js/lib/ext/filter.js index 1af98e25..9c975d18 100644 --- a/src/_h5ai/public/js/lib/ext/filter.js +++ b/src/_h5ai/public/js/lib/ext/filter.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); diff --git a/src/_h5ai/public/js/lib/ext/google-analytics.js b/src/_h5ai/public/js/lib/ext/google-analytics.js index 52940884..8d838ebe 100644 --- a/src/_h5ai/public/js/lib/ext/google-analytics.js +++ b/src/_h5ai/public/js/lib/ext/google-analytics.js @@ -1,4 +1,4 @@ -const {window: win, _: lo} = require('../win'); +const {win, lo} = require('../globals'); const event = require('../core/event'); const allsettings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/ext/info.js b/src/_h5ai/public/js/lib/ext/info.js index 18c1c8d6..419b3b46 100644 --- a/src/_h5ai/public/js/lib/ext/info.js +++ b/src/_h5ai/public/js/lib/ext/info.js @@ -1,4 +1,4 @@ -const {window: win, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const format = require('../core/format'); const resource = require('../core/resource'); diff --git a/src/_h5ai/public/js/lib/ext/l10n.js b/src/_h5ai/public/js/lib/ext/l10n.js index 06322a8d..1a5604b8 100644 --- a/src/_h5ai/public/js/lib/ext/l10n.js +++ b/src/_h5ai/public/js/lib/ext/l10n.js @@ -1,4 +1,4 @@ -const {navigator, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const format = require('../core/format'); const langs = require('../core/langs'); @@ -89,7 +89,7 @@ function localize(languages, isoCode, useBrowserLang) { if (languages[storedIsoCode]) { isoCode = storedIsoCode; } else if (useBrowserLang) { - const browserLang = navigator.language || navigator.browserLanguage; + const browserLang = win.navigator.language || win.navigator.browserLanguage; if (browserLang) { if (languages[browserLang]) { isoCode = browserLang; diff --git a/src/_h5ai/public/js/lib/ext/peer5.js b/src/_h5ai/public/js/lib/ext/peer5.js index 99c33b9a..323c2855 100644 --- a/src/_h5ai/public/js/lib/ext/peer5.js +++ b/src/_h5ai/public/js/lib/ext/peer5.js @@ -1,4 +1,4 @@ -const {window: win, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const allsettings = require('../core/settings'); const settings = lo.extend({ diff --git a/src/_h5ai/public/js/lib/ext/piwik-analytics.js b/src/_h5ai/public/js/lib/ext/piwik-analytics.js index 32bcb22f..2ad4e5ee 100644 --- a/src/_h5ai/public/js/lib/ext/piwik-analytics.js +++ b/src/_h5ai/public/js/lib/ext/piwik-analytics.js @@ -1,4 +1,4 @@ -const {window: win, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const allsettings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/ext/preview-aud.js b/src/_h5ai/public/js/lib/ext/preview-aud.js index 7ca9e7e7..564cdc51 100644 --- a/src/_h5ai/public/js/lib/ext/preview-aud.js +++ b/src/_h5ai/public/js/lib/ext/preview-aud.js @@ -1,4 +1,4 @@ -const {setTimeout, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const format = require('../core/format'); const allsettings = require('../core/settings'); @@ -13,7 +13,7 @@ function preloadAudio(src, callback) { const $audio = jq('') .one('loadedmetadata', () => { callback($audio); - // setTimeout(function () { callback($img); }, 1000); // for testing + // win.setTimeout(function () { callback($img); }, 1000); // for testing }) .attr('autoplay', 'autoplay') .attr('controls', 'controls') @@ -46,7 +46,7 @@ function onEnter(items, idx) { currentIdx = (currentIdx + rel + currentItems.length) % currentItems.length; currentItem = currentItems[currentIdx]; - const spinnerTimeout = setTimeout(() => preview.showSpinner(true), 200); + const spinnerTimeout = win.setTimeout(() => preview.showSpinner(true), 200); if (jq('#pv-aud-audio').length) { jq('#pv-aud-audio')[0].pause(); @@ -61,11 +61,11 @@ function onEnter(items, idx) { function swap(nuContent) { jq('#pv-content').empty().append(nuContent.attr('id', 'pv-vid-audio')).fadeIn(200); // small timeout, so nuContent is visible and therefore its width is available - setTimeout(updateMeta, 10); + win.setTimeout(updateMeta, 10); } function onReady($preloadedContent) { - clearTimeout(spinnerTimeout); + win.clearTimeout(spinnerTimeout); preview.showSpinner(false); jq('#pv-content').fadeOut(100, () => swap($preloadedContent)); diff --git a/src/_h5ai/public/js/lib/ext/preview-img.js b/src/_h5ai/public/js/lib/ext/preview-img.js index ba82d557..17847e7c 100644 --- a/src/_h5ai/public/js/lib/ext/preview-img.js +++ b/src/_h5ai/public/js/lib/ext/preview-img.js @@ -1,4 +1,4 @@ -const {setTimeout, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const server = require('../core/server'); const allsettings = require('../core/settings'); @@ -42,7 +42,7 @@ function preloadImage(item, callback) { callback(item, ev.target); // for testing - // setTimeout(function () { callback(item, ev.target); }, 1000); + // win.setTimeout(function () { callback(item, ev.target); }, 1000); }) .attr('src', src); }); @@ -81,8 +81,8 @@ function onIdxChange(rel) { if (preview.isSpinnerVisible()) { preview.showSpinner(true, currentItem.thumbSquare); } else { - clearTimeout(spinnerTimeoutId); - spinnerTimeoutId = setTimeout(() => { + win.clearTimeout(spinnerTimeoutId); + spinnerTimeoutId = win.setTimeout(() => { preview.showSpinner(true, currentItem.thumbSquare); }, spinnerThreshold); } @@ -92,7 +92,7 @@ function onIdxChange(rel) { return; } - clearTimeout(spinnerTimeoutId); + win.clearTimeout(spinnerTimeoutId); preview.showSpinner(false); jq('#pv-content') .empty() diff --git a/src/_h5ai/public/js/lib/ext/preview-txt.js b/src/_h5ai/public/js/lib/ext/preview-txt.js index 4de3279d..32d588e5 100644 --- a/src/_h5ai/public/js/lib/ext/preview-txt.js +++ b/src/_h5ai/public/js/lib/ext/preview-txt.js @@ -1,4 +1,4 @@ -const {setTimeout, jQuery: jq, _: lo, marked, Prism: prism} = require('../win'); +const {win, jq, lo, marked, prism} = require('../globals'); const event = require('../core/event'); const allsettings = require('../core/settings'); const preview = require('./preview'); @@ -26,7 +26,7 @@ function preloadText(item, callback) { callback(item, content); // for testing - // setTimeout(function () { callback(item, content); }, 1000); + // win.setTimeout(function () { callback(item, content); }, 1000); }) .fail((jqXHR, textStatus) => { callback(item, '[ajax error] ' + textStatus); @@ -57,8 +57,8 @@ function onIdxChange(rel) { if (preview.isSpinnerVisible()) { preview.showSpinner(true, currentItem.icon); } else { - clearTimeout(spinnerTimeoutId); - spinnerTimeoutId = setTimeout(() => { + win.clearTimeout(spinnerTimeoutId); + spinnerTimeoutId = win.setTimeout(() => { preview.showSpinner(true, currentItem.icon); }, spinnerThreshold); } @@ -86,13 +86,13 @@ function onIdxChange(rel) { $code.empty().html(prism.highlight(textContent, prism.languages[type])); } else { $code.empty().text(textContent); - setTimeout(() => { + win.setTimeout(() => { $code.empty().html(prism.highlight(textContent, prism.languages[type])); }, 300); } } - clearTimeout(spinnerTimeoutId); + win.clearTimeout(spinnerTimeoutId); preview.showSpinner(false); jq('#pv-content') .empty() diff --git a/src/_h5ai/public/js/lib/ext/preview-vid.js b/src/_h5ai/public/js/lib/ext/preview-vid.js index 0d49108b..3c897e09 100644 --- a/src/_h5ai/public/js/lib/ext/preview-vid.js +++ b/src/_h5ai/public/js/lib/ext/preview-vid.js @@ -1,4 +1,4 @@ -const {setTimeout, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const allsettings = require('../core/settings'); const preview = require('./preview'); @@ -12,7 +12,7 @@ function preloadVideo(src, callback) { const $video = jq('') .one('loadedmetadata', () => { callback($video); - // setTimeout(function () { callback($video); }, 1000); // for testing + // win.setTimeout(function () { callback($video); }, 1000); // for testing }) .attr('autoplay', 'autoplay') .attr('controls', 'controls') @@ -46,7 +46,7 @@ function onEnter(items, idx) { currentIdx = (currentIdx + rel + currentItems.length) % currentItems.length; currentItem = currentItems[currentIdx]; - const spinnerTimeout = setTimeout(() => preview.showSpinner(true), 200); + const spinnerTimeout = win.setTimeout(() => preview.showSpinner(true), 200); if (jq('#pv-vid-video').length) { jq('#pv-vid-video')[0].pause(); @@ -61,11 +61,11 @@ function onEnter(items, idx) { function swap(nuContent) { jq('#pv-content').empty().append(nuContent.attr('id', 'pv-vid-video')).fadeIn(200); // small timeout, so nuContent is visible and therefore its width is available - setTimeout(updateMeta, 10); + win.setTimeout(updateMeta, 10); } function onReady($preloadedContent) { - clearTimeout(spinnerTimeout); + win.clearTimeout(spinnerTimeout); preview.showSpinner(false); jq('#pv-content').fadeOut(100, () => swap($preloadedContent)); diff --git a/src/_h5ai/public/js/lib/ext/preview.js b/src/_h5ai/public/js/lib/ext/preview.js index 7b1d33d1..1b096601 100644 --- a/src/_h5ai/public/js/lib/ext/preview.js +++ b/src/_h5ai/public/js/lib/ext/preview.js @@ -1,4 +1,4 @@ -const {window: win, setTimeout, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); const store = require('../core/store'); @@ -89,11 +89,11 @@ function onPrevious() { } function userAlive() { - clearTimeout(userAliveTimeoutId); + win.clearTimeout(userAliveTimeoutId); jq('#pv-overlay .hof').stop(true, true).fadeIn(200); if (isFullscreen) { - userAliveTimeoutId = setTimeout(() => { + userAliveTimeoutId = win.setTimeout(() => { jq('#pv-overlay .hof').stop(true, true).fadeOut(2000); }, 2000); } diff --git a/src/_h5ai/public/js/lib/ext/search.js b/src/_h5ai/public/js/lib/ext/search.js index b4a6d4a1..f45ddba1 100644 --- a/src/_h5ai/public/js/lib/ext/search.js +++ b/src/_h5ai/public/js/lib/ext/search.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); diff --git a/src/_h5ai/public/js/lib/ext/select.js b/src/_h5ai/public/js/lib/ext/select.js index 7923c1c4..03e4f5f2 100644 --- a/src/_h5ai/public/js/lib/ext/select.js +++ b/src/_h5ai/public/js/lib/ext/select.js @@ -1,9 +1,10 @@ -const {document: doc, jQuery: jq, _: lo} = require('../win'); +const {win, jq, lo} = require('../globals'); const event = require('../core/event'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); +const doc = win.document; const settings = lo.extend({ enabled: false, clickndrag: false, diff --git a/src/_h5ai/public/js/lib/ext/sort.js b/src/_h5ai/public/js/lib/ext/sort.js index 1066e4b4..4641409b 100644 --- a/src/_h5ai/public/js/lib/ext/sort.js +++ b/src/_h5ai/public/js/lib/ext/sort.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/ext/thumbnails.js b/src/_h5ai/public/js/lib/ext/thumbnails.js index c8cd3552..766672ae 100644 --- a/src/_h5ai/public/js/lib/ext/thumbnails.js +++ b/src/_h5ai/public/js/lib/ext/thumbnails.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); const event = require('../core/event'); const server = require('../core/server'); const allsettings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/ext/title.js b/src/_h5ai/public/js/lib/ext/title.js index 63f18c3e..6b81e2b1 100644 --- a/src/_h5ai/public/js/lib/ext/title.js +++ b/src/_h5ai/public/js/lib/ext/title.js @@ -1,8 +1,9 @@ -const {document: doc, _: lo} = require('../win'); +const {win, lo} = require('../globals'); const event = require('../core/event'); const allsettings = require('../core/settings'); +const doc = win.document; const settings = lo.extend({ enabled: false }, allsettings.title); diff --git a/src/_h5ai/public/js/lib/ext/tree.js b/src/_h5ai/public/js/lib/ext/tree.js index 64700e55..5768ae98 100644 --- a/src/_h5ai/public/js/lib/ext/tree.js +++ b/src/_h5ai/public/js/lib/ext/tree.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); diff --git a/src/_h5ai/public/js/lib/globals.js b/src/_h5ai/public/js/lib/globals.js new file mode 100644 index 00000000..62ca226d --- /dev/null +++ b/src/_h5ai/public/js/lib/globals.js @@ -0,0 +1,14 @@ +const globals = module.exports = {}; + +const publish = (id, name) => { + if (!global[id]) { + throw new Error(`no-global: ${id}`); + } + globals[name] = global[id]; +}; + +publish('window', 'win'); +publish('_', 'lo'); +publish('jQuery', 'jq'); +publish('marked', 'marked'); +publish('Prism', 'prism'); diff --git a/src/_h5ai/public/js/lib/init.js b/src/_h5ai/public/js/lib/init.js index a040537f..c4b2430d 100644 --- a/src/_h5ai/public/js/lib/init.js +++ b/src/_h5ai/public/js/lib/init.js @@ -1,8 +1,8 @@ -// const {jQuery: jq} = require('./win'); +// const {jq} = require('./globals'); // const config = require('./config'); // // const name = jq('script[data-module]').data('module'); -// const request = { +// const query = { // action: 'get', // setup: true, // options: true, @@ -10,26 +10,26 @@ // }; // // if (name === 'index') { -// request.theme = true; -// request.langs = true; +// query.theme = true; +// query.langs = true; // } else if (name === 'info') { -// request.refresh = true; +// query.refresh = true; // } else { // throw new Error(`no-main-module: '${name}'`); // } // -// config._update(request).then(() => { +// config._update(query).then(() => { // jq(() => require(`./main/${name}`)); // }); module.exports = (deps = {}) => { const { - jq = require('./win').jQuery, + jq = require('./globals').jq, config = require('./config') } = deps; const name = jq('script[data-module]').data('module'); - const request = { + const query = { action: 'get', setup: true, options: true, @@ -37,15 +37,15 @@ module.exports = (deps = {}) => { }; if (name === 'index') { - request.theme = true; - request.langs = true; + query.theme = true; + query.langs = true; } else if (name === 'info') { - request.refresh = true; + query.refresh = true; } else { throw new Error(`no-main-module: '${name}'`); } - config._update(request).then(() => { + config._update(query).then(() => { jq(() => require(`./main/${name}`)); }); }; diff --git a/src/_h5ai/public/js/lib/main/index.js b/src/_h5ai/public/js/lib/main/index.js index 976311e7..045a62b1 100644 --- a/src/_h5ai/public/js/lib/main/index.js +++ b/src/_h5ai/public/js/lib/main/index.js @@ -1,4 +1,4 @@ -const {document: doc} = require('../win'); +const {win} = require('../globals'); const location = require('../core/location'); require('../view/viewmode'); @@ -25,4 +25,4 @@ require('../ext/thumbnails'); require('../ext/title'); require('../ext/tree'); -location.setLocation(doc.location.href, true); +location.setLocation(win.document.location.href, true); diff --git a/src/_h5ai/public/js/lib/main/info.js b/src/_h5ai/public/js/lib/main/info.js index 5579d769..7eeddd59 100644 --- a/src/_h5ai/public/js/lib/main/info.js +++ b/src/_h5ai/public/js/lib/main/info.js @@ -1,4 +1,4 @@ -const {window: win, jQuery: jq} = require('../win'); +const {win, jq} = require('../globals'); const config = require('../config'); const resource = require('../core/resource'); const server = require('../core/server'); diff --git a/src/_h5ai/public/js/lib/model/item.js b/src/_h5ai/public/js/lib/model/item.js index b00e1b49..76df5c62 100644 --- a/src/_h5ai/public/js/lib/model/item.js +++ b/src/_h5ai/public/js/lib/model/item.js @@ -1,4 +1,4 @@ -const {_: lo} = require('../win'); +const {lo} = require('../globals'); const location = require('../core/location'); const server = require('../core/server'); const settings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/view/content.js b/src/_h5ai/public/js/lib/view/content.js index 9b5ea1f8..195d277a 100644 --- a/src/_h5ai/public/js/lib/view/content.js +++ b/src/_h5ai/public/js/lib/view/content.js @@ -1,4 +1,4 @@ -const {jQuery: jq} = require('../win'); +const {jq} = require('../globals'); const mainrow = require('./mainrow'); const $el = jq('
').appendTo(mainrow.$el); diff --git a/src/_h5ai/public/js/lib/view/mainrow.js b/src/_h5ai/public/js/lib/view/mainrow.js index a711c17c..059f68aa 100644 --- a/src/_h5ai/public/js/lib/view/mainrow.js +++ b/src/_h5ai/public/js/lib/view/mainrow.js @@ -1,4 +1,4 @@ -const {jQuery: jq} = require('../win'); +const {jq} = require('../globals'); const root = require('./root'); const $el = jq('').appendTo(root.$el); diff --git a/src/_h5ai/public/js/lib/view/notification.js b/src/_h5ai/public/js/lib/view/notification.js index 58022c1e..d99bb236 100644 --- a/src/_h5ai/public/js/lib/view/notification.js +++ b/src/_h5ai/public/js/lib/view/notification.js @@ -1,4 +1,4 @@ -const {jQuery: jq} = require('../win'); +const {jq} = require('../globals'); const root = require('./root'); const $el = jq('').hide().appendTo(root.$el); diff --git a/src/_h5ai/public/js/lib/view/root.js b/src/_h5ai/public/js/lib/view/root.js index 4c4bfad7..7c417443 100644 --- a/src/_h5ai/public/js/lib/view/root.js +++ b/src/_h5ai/public/js/lib/view/root.js @@ -1,4 +1,4 @@ -const {jQuery: jq} = require('../win'); +const {jq} = require('../globals'); const $el = jq('body').attr('id', 'root'); diff --git a/src/_h5ai/public/js/lib/view/sidebar.js b/src/_h5ai/public/js/lib/view/sidebar.js index ad8f71b8..97bb46c3 100644 --- a/src/_h5ai/public/js/lib/view/sidebar.js +++ b/src/_h5ai/public/js/lib/view/sidebar.js @@ -1,4 +1,4 @@ -const {jQuery: jq} = require('../win'); +const {jq} = require('../globals'); const resource = require('../core/resource'); const store = require('../core/store'); const mainrow = require('./mainrow'); diff --git a/src/_h5ai/public/js/lib/view/topbar.js b/src/_h5ai/public/js/lib/view/topbar.js index a4197be9..bbd405a0 100644 --- a/src/_h5ai/public/js/lib/view/topbar.js +++ b/src/_h5ai/public/js/lib/view/topbar.js @@ -1,4 +1,4 @@ -const {jQuery: jq} = require('../win'); +const {jq} = require('../globals'); const root = require('./root'); const tplTopbar = diff --git a/src/_h5ai/public/js/lib/view/view.js b/src/_h5ai/public/js/lib/view/view.js index 7c553942..f012be14 100644 --- a/src/_h5ai/public/js/lib/view/view.js +++ b/src/_h5ai/public/js/lib/view/view.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const format = require('../core/format'); const location = require('../core/location'); diff --git a/src/_h5ai/public/js/lib/view/viewmode.js b/src/_h5ai/public/js/lib/view/viewmode.js index 67154953..ce6850f4 100644 --- a/src/_h5ai/public/js/lib/view/viewmode.js +++ b/src/_h5ai/public/js/lib/view/viewmode.js @@ -1,4 +1,4 @@ -const {jQuery: jq, _: lo} = require('../win'); +const {jq, lo} = require('../globals'); const event = require('../core/event'); const resource = require('../core/resource'); const allsettings = require('../core/settings'); diff --git a/src/_h5ai/public/js/lib/win.js b/src/_h5ai/public/js/lib/win.js deleted file mode 100644 index c131bc06..00000000 --- a/src/_h5ai/public/js/lib/win.js +++ /dev/null @@ -1,5 +0,0 @@ -const win = module.exports = global.window; - -if (typeof win !== 'object' || win.window !== win || !win.document) { - throw new Error('no-window'); -} diff --git a/test/.eslintrc b/test/.eslintrc index f1ac9ec4..65cfb122 100644 --- a/test/.eslintrc +++ b/test/.eslintrc @@ -15,29 +15,8 @@ uniq: false sinon: false - ecmaFeatures: - arrowFunctions: false - binaryLiterals: false - blockBindings: false - classes: false - defaultParams: false - destructuring: false - forOf: false - generators: false - globalReturn: false - jsx: false - modules: false - objectLiteralComputedProperties: false - objectLiteralDuplicateProperties: false - objectLiteralShorthandMethods: false - objectLiteralShorthandProperties: false - octalLiterals: false - regexUFlag: false - regexYFlag: false - spread: false - superInFunctions: false - templateStrings: false - unicodeCodePointEscapes: false + parserOptions: + ecmaVersion: 6 rules: consistent-this: 0