From 324fceb5c3e1a3f79c6102c9f16d1b41d37163fc Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 19 Jun 2016 19:21:32 +0200 Subject: [PATCH] Move server to root dir. --- src/_h5ai/public/js/lib/config.js | 2 +- src/_h5ai/public/js/lib/core/location.js | 2 +- src/_h5ai/public/js/lib/ext/custom.js | 2 +- src/_h5ai/public/js/lib/ext/download.js | 2 +- src/_h5ai/public/js/lib/ext/l10n.js | 2 +- src/_h5ai/public/js/lib/ext/preview-img.js | 2 +- src/_h5ai/public/js/lib/ext/search.js | 2 +- src/_h5ai/public/js/lib/ext/thumbnails.js | 2 +- src/_h5ai/public/js/lib/main/info.js | 2 +- src/_h5ai/public/js/lib/model/item.js | 2 +- src/_h5ai/public/js/lib/{core => }/server.js | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename src/_h5ai/public/js/lib/{core => }/server.js (94%) diff --git a/src/_h5ai/public/js/lib/config.js b/src/_h5ai/public/js/lib/config.js index 9614a9f8..1d436586 100644 --- a/src/_h5ai/public/js/lib/config.js +++ b/src/_h5ai/public/js/lib/config.js @@ -1,4 +1,4 @@ -const {request} = require('./core/server'); +const {request} = require('./server'); const config = module.exports = { _update: query => { diff --git a/src/_h5ai/public/js/lib/core/location.js b/src/_h5ai/public/js/lib/core/location.js index 893f555d..79bb5d8a 100644 --- a/src/_h5ai/public/js/lib/core/location.js +++ b/src/_h5ai/public/js/lib/core/location.js @@ -1,5 +1,5 @@ const {win, lo} = require('../globals'); -const {request} = require('./server'); +const {request} = require('../server'); const allsettings = require('./settings'); const event = require('./event'); diff --git a/src/_h5ai/public/js/lib/ext/custom.js b/src/_h5ai/public/js/lib/ext/custom.js index 77d791bc..e91da71f 100644 --- a/src/_h5ai/public/js/lib/ext/custom.js +++ b/src/_h5ai/public/js/lib/ext/custom.js @@ -1,6 +1,6 @@ const {jq, lo, marked} = require('../globals'); +const server = require('../server'); 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 81b10eaa..b96fe439 100644 --- a/src/_h5ai/public/js/lib/ext/download.js +++ b/src/_h5ai/public/js/lib/ext/download.js @@ -1,8 +1,8 @@ const {jq, lo} = require('../globals'); +const server = require('../server'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); -const server = require('../core/server'); const allsettings = require('../core/settings'); const settings = lo.extend({ diff --git a/src/_h5ai/public/js/lib/ext/l10n.js b/src/_h5ai/public/js/lib/ext/l10n.js index 1a5604b8..7ba8efe6 100644 --- a/src/_h5ai/public/js/lib/ext/l10n.js +++ b/src/_h5ai/public/js/lib/ext/l10n.js @@ -1,8 +1,8 @@ const {win, jq, lo} = require('../globals'); +const server = require('../server'); const event = require('../core/event'); const format = require('../core/format'); const langs = require('../core/langs'); -const server = require('../core/server'); const allsettings = require('../core/settings'); const store = require('../core/store'); diff --git a/src/_h5ai/public/js/lib/ext/preview-img.js b/src/_h5ai/public/js/lib/ext/preview-img.js index 17847e7c..7cb88599 100644 --- a/src/_h5ai/public/js/lib/ext/preview-img.js +++ b/src/_h5ai/public/js/lib/ext/preview-img.js @@ -1,6 +1,6 @@ const {win, jq, lo} = require('../globals'); +const server = require('../server'); const event = require('../core/event'); -const server = require('../core/server'); const allsettings = require('../core/settings'); const preview = require('./preview'); diff --git a/src/_h5ai/public/js/lib/ext/search.js b/src/_h5ai/public/js/lib/ext/search.js index f45ddba1..277b9191 100644 --- a/src/_h5ai/public/js/lib/ext/search.js +++ b/src/_h5ai/public/js/lib/ext/search.js @@ -1,8 +1,8 @@ const {jq, lo} = require('../globals'); +const server = require('../server'); const event = require('../core/event'); const location = require('../core/location'); const resource = require('../core/resource'); -const server = require('../core/server'); const allsettings = require('../core/settings'); const util = require('../core/util'); const Item = require('../model/item'); diff --git a/src/_h5ai/public/js/lib/ext/thumbnails.js b/src/_h5ai/public/js/lib/ext/thumbnails.js index 766672ae..15fb1254 100644 --- a/src/_h5ai/public/js/lib/ext/thumbnails.js +++ b/src/_h5ai/public/js/lib/ext/thumbnails.js @@ -1,6 +1,6 @@ const {lo} = require('../globals'); +const server = require('../server'); const event = require('../core/event'); -const server = require('../core/server'); const allsettings = require('../core/settings'); const settings = lo.extend({ diff --git a/src/_h5ai/public/js/lib/main/info.js b/src/_h5ai/public/js/lib/main/info.js index 7eeddd59..9005bb8a 100644 --- a/src/_h5ai/public/js/lib/main/info.js +++ b/src/_h5ai/public/js/lib/main/info.js @@ -1,7 +1,7 @@ const {win, jq} = require('../globals'); const config = require('../config'); +const server = require('../server'); const resource = require('../core/resource'); -const server = require('../core/server'); const tplTests = diff --git a/src/_h5ai/public/js/lib/model/item.js b/src/_h5ai/public/js/lib/model/item.js index 76df5c62..dfa4ee21 100644 --- a/src/_h5ai/public/js/lib/model/item.js +++ b/src/_h5ai/public/js/lib/model/item.js @@ -1,6 +1,6 @@ const {lo} = require('../globals'); +const server = require('../server'); const location = require('../core/location'); -const server = require('../core/server'); const settings = require('../core/settings'); const types = require('../core/types'); diff --git a/src/_h5ai/public/js/lib/core/server.js b/src/_h5ai/public/js/lib/server.js similarity index 94% rename from src/_h5ai/public/js/lib/core/server.js rename to src/_h5ai/public/js/lib/server.js index ebcf302c..2ac4e285 100644 --- a/src/_h5ai/public/js/lib/core/server.js +++ b/src/_h5ai/public/js/lib/server.js @@ -1,4 +1,4 @@ -const {jq, lo} = require('../globals'); +const {jq, lo} = require('./globals'); function request(data) { return new Promise(resolve => {