';
- var storekey = 'ext/tree';
+const {jQuery: jq, _: lo} = require('../win');
+const event = require('../core/event');
+const location = require('../core/location');
+const resource = require('../core/resource');
+const allsettings = require('../core/settings');
+const store = require('../core/store');
+const util = require('../core/util');
- function cmpFn(item1, item2) {
- var val1 = item1.label;
- var val2 = item2.label;
+const settings = lo.extend({
+ enabled: false,
+ show: true,
+ maxSubfolders: 50,
+ naturalSort: false,
+ ignorecase: true
+}, allsettings.tree);
+const template =
+ `
+
+ })
+
+
+ ![]()
+
+
+ `;
+const settingsTemplate =
+ `
`;
+const storekey = 'ext/tree';
- if (settings.ignorecase) {
- val1 = val1.toLowerCase();
- val2 = val2.toLowerCase();
- }
- return settings.natural ? util.naturalCmpFn(val1, val2) : util.regularCmpFn(val1, val2);
+function cmpFn(item1, item2) {
+ let val1 = item1.label;
+ let val2 = item2.label;
+
+ if (settings.ignorecase) {
+ val1 = val1.toLowerCase();
+ val2 = val2.toLowerCase();
}
- function update(item) {
- var $html = $(template);
- var $indicator = $html.find('.indicator');
- var $a = $html.find('a');
- var $img = $html.find('.icon img');
- var $label = $html.find('.label');
+ return settings.natural ? util.naturalCmpFn(val1, val2) : util.regularCmpFn(val1, val2);
+}
- $html
- .addClass(item.isFolder() ? 'folder' : 'file')
- .data('item', item);
+function update(item) {
+ const $html = jq(template);
+ const $indicator = $html.find('.indicator');
+ const $a = $html.find('a');
+ const $img = $html.find('.icon img');
+ const $label = $html.find('.label');
- location.setLink($a, item);
- $img.attr('src', resource.icon('folder'));
- $label.text(item.label);
+ $html
+ .addClass(item.isFolder() ? 'folder' : 'file')
+ .data('item', item);
- if (item.isFolder()) {
- var subfolders = item.getSubfolders();
+ location.setLink($a, item);
+ $img.attr('src', resource.icon('folder'));
+ $label.text(item.label);
- // indicator
- if (item.isManaged && !item.isContentFetched || subfolders.length) {
- $indicator.removeClass('none');
+ if (item.isFolder()) {
+ const subfolders = item.getSubfolders();
- if (item.isManaged && !item.isContentFetched) {
- $indicator.addClass('unknown');
- } else if (item.isContentVisible) {
- $indicator.addClass('open');
- } else {
- $indicator.addClass('close');
- }
- }
+ // indicator
+ if (item.isManaged && !item.isContentFetched || subfolders.length) {
+ $indicator.removeClass('none');
- // is it the current folder?
- if (item.isCurrentFolder()) {
- $html.addClass('active');
- }
-
- // does it have subfolders?
- if (subfolders.length) {
- subfolders.sort(cmpFn);
-
- var $ul = $('
').appendTo($html);
- var counter = 0;
- _.each(subfolders, function (e) {
- counter += 1;
- if (counter <= settings.maxSubfolders) {
- $('
').append(update(e)).appendTo($ul);
- }
- });
- if (subfolders.length > settings.maxSubfolders) {
- $('
… ' + (subfolders.length - settings.maxSubfolders) + ' more subfolders').appendTo($ul);
- }
- if (!item.isContentVisible) {
- $ul.hide();
- }
- }
-
- // reflect folder status
- if (!item.isManaged) {
- $img.attr('src', resource.icon('folder-page'));
- }
- }
-
- if (item.$tree) {
- item.$tree.replaceWith($html);
- }
- item.$tree = $html;
-
- return $html;
- }
-
- function createOnIndicatorClick() {
- function slide(item, $indicator, $content, down) {
- item.isContentVisible = down;
- $indicator.removeClass('open close').addClass(down ? 'open' : 'close');
- $content[down ? 'slideDown' : 'slideUp']();
- }
-
- return function () {
- var $indicator = $(this);
- var $item = $indicator.closest('.item');
- var item = $item.data('item');
- var $content = $item.find('> ul.content');
-
- if ($indicator.hasClass('unknown')) {
- item.fetchContent(function () {
- item.isContentVisible = false;
-
- $item = update(item);
- $indicator = $item.find('> .indicator');
- $content = $item.find('> ul.content');
-
- if (!$indicator.hasClass('none')) {
- slide(item, $indicator, $content, true);
- }
- });
- } else if ($indicator.hasClass('open')) {
- slide(item, $indicator, $content, false);
- } else if ($indicator.hasClass('close')) {
- slide(item, $indicator, $content, true);
- }
- };
- }
-
- function fetchTree(item, callback) {
- item.isContentVisible = true;
- item.fetchContent(function () {
- if (item.parent) {
- fetchTree(item.parent, callback);
+ if (item.isManaged && !item.isContentFetched) {
+ $indicator.addClass('unknown');
+ } else if (item.isContentVisible) {
+ $indicator.addClass('open');
} else {
- callback(item);
+ $indicator.addClass('close');
}
- });
- }
-
- function updateSettings() {
- if (store.get(storekey)) {
- $('#view-tree').addClass('active');
- $('#tree').show();
- } else {
- $('#view-tree').removeClass('active');
- $('#tree').hide();
- }
- }
-
- function onLocationChanged(item) {
- fetchTree(item, function (root) {
- $('#tree').append(update(root));
- updateSettings();
- });
- }
-
- function init() {
- if (!settings.enabled) {
- return;
}
- $('
')
- .appendTo('#mainrow')
- .on('click', '.indicator', createOnIndicatorClick());
+ // is it the current folder?
+ if (item.isCurrentFolder()) {
+ $html.addClass('active');
+ }
- $(settingsTemplate)
- .appendTo('#sidebar')
- .find('#view-tree')
- .on('click', function (ev) {
- store.put(storekey, !store.get(storekey));
- updateSettings();
- ev.preventDefault();
+ // does it have subfolders?
+ if (subfolders.length) {
+ subfolders.sort(cmpFn);
+
+ const $ul = jq('
').appendTo($html);
+ let counter = 0;
+ lo.each(subfolders, e => {
+ counter += 1;
+ if (counter <= settings.maxSubfolders) {
+ jq('
').append(update(e)).appendTo($ul);
+ }
});
-
- // ensure stored value is boolean, otherwise set default
- if (typeof store.get(storekey) !== 'boolean') {
- store.put(storekey, settings.show);
+ if (subfolders.length > settings.maxSubfolders) {
+ jq('
… ' + (subfolders.length - settings.maxSubfolders) + ' more subfolders').appendTo($ul);
+ }
+ if (!item.isContentVisible) {
+ $ul.hide();
+ }
}
- updateSettings();
- event.sub('location.changed', onLocationChanged);
+ // reflect folder status
+ if (!item.isManaged) {
+ $img.attr('src', resource.icon('folder-page'));
+ }
}
+ if (item.$tree) {
+ item.$tree.replaceWith($html);
+ }
+ item.$tree = $html;
- init();
-});
+ return $html;
+}
+
+function createOnIndicatorClick() {
+ function slide(item, $indicator, $content, down) {
+ item.isContentVisible = down;
+ $indicator.removeClass('open close').addClass(down ? 'open' : 'close');
+ $content[down ? 'slideDown' : 'slideUp']();
+ }
+
+ return ev => {
+ let $indicator = jq(ev.currentTarget);
+ let $item = $indicator.closest('.item');
+ const item = $item.data('item');
+ let $content = $item.find('> ul.content');
+
+ if ($indicator.hasClass('unknown')) {
+ item.fetchContent(() => {
+ item.isContentVisible = false;
+
+ $item = update(item);
+ $indicator = $item.find('> .indicator');
+ $content = $item.find('> ul.content');
+
+ if (!$indicator.hasClass('none')) {
+ slide(item, $indicator, $content, true);
+ }
+ });
+ } else if ($indicator.hasClass('open')) {
+ slide(item, $indicator, $content, false);
+ } else if ($indicator.hasClass('close')) {
+ slide(item, $indicator, $content, true);
+ }
+ };
+}
+
+function fetchTree(item, callback) {
+ item.isContentVisible = true;
+ item.fetchContent(() => {
+ if (item.parent) {
+ fetchTree(item.parent, callback);
+ } else {
+ callback(item);
+ }
+ });
+}
+
+function updateSettings() {
+ if (store.get(storekey)) {
+ jq('#view-tree').addClass('active');
+ jq('#tree').show();
+ } else {
+ jq('#view-tree').removeClass('active');
+ jq('#tree').hide();
+ }
+}
+
+function onLocationChanged(item) {
+ fetchTree(item, root => {
+ jq('#tree').append(update(root));
+ updateSettings();
+ });
+}
+
+function init() {
+ if (!settings.enabled) {
+ return;
+ }
+
+ jq('
')
+ .appendTo('#mainrow')
+ .on('click', '.indicator', createOnIndicatorClick());
+
+ jq(settingsTemplate)
+ .appendTo('#sidebar')
+ .find('#view-tree')
+ .on('click', ev => {
+ store.put(storekey, !store.get(storekey));
+ updateSettings();
+ ev.preventDefault();
+ });
+
+ // ensure stored value is boolean, otherwise set default
+ if (typeof store.get(storekey) !== 'boolean') {
+ store.put(storekey, settings.show);
+ }
+ updateSettings();
+
+ event.sub('location.changed', onLocationChanged);
+}
+
+
+init();
diff --git a/src/_h5ai/public/js/lib/init.js b/src/_h5ai/public/js/lib/init.js
new file mode 100644
index 00000000..d7d064aa
--- /dev/null
+++ b/src/_h5ai/public/js/lib/init.js
@@ -0,0 +1,23 @@
+const {jQuery: jq} = require('./win');
+const config = require('./config');
+
+const name = jq('script[data-module]').data('module');
+const request = {
+ action: 'get',
+ setup: true,
+ options: true,
+ types: true
+};
+
+if (name === 'index') {
+ request.theme = true;
+ request.langs = true;
+} else if (name === 'info') {
+ request.refresh = true;
+} else {
+ throw new Error(`no-main-module: '${name}'`);
+}
+
+config._update(request).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 a45c2fb6..976311e7 100644
--- a/src/_h5ai/public/js/lib/main/index.js
+++ b/src/_h5ai/public/js/lib/main/index.js
@@ -1,11 +1,28 @@
-modulejs.define('main/index', ['_', 'core/location'], function (_, location) {
- modulejs.require('view/viewmode');
+const {document: doc} = require('../win');
+const location = require('../core/location');
- _.each(modulejs.state(), function (state, id) {
- if (id.indexOf('ext/') === 0) {
- modulejs.require(id);
- }
- });
+require('../view/viewmode');
+require('../ext/autorefresh');
+require('../ext/contextmenu');
+require('../ext/crumb');
+require('../ext/custom');
+require('../ext/download');
+require('../ext/filter');
+require('../ext/google-analytics');
+require('../ext/info');
+require('../ext/l10n');
+require('../ext/peer5');
+require('../ext/piwik-analytics');
+require('../ext/preview');
+require('../ext/preview-aud');
+require('../ext/preview-img');
+require('../ext/preview-txt');
+require('../ext/preview-vid');
+require('../ext/search');
+require('../ext/select');
+require('../ext/sort');
+require('../ext/thumbnails');
+require('../ext/title');
+require('../ext/tree');
- location.setLocation(document.location.href, true);
-});
+location.setLocation(doc.location.href, true);
diff --git a/src/_h5ai/public/js/lib/main/info.js b/src/_h5ai/public/js/lib/main/info.js
index 1d848151..5579d769 100644
--- a/src/_h5ai/public/js/lib/main/info.js
+++ b/src/_h5ai/public/js/lib/main/info.js
@@ -1,178 +1,182 @@
-modulejs.define('main/info', ['$', 'config', 'core/resource', 'core/server'], function ($, config, resource, server) {
- var tplTests =
- '
';
- var tplTest =
- '- ' +
- '' +
- '' +
- '' +
- '
';
- var tplLogin =
- '' +
- '
' +
- '
login' +
- '
logout' +
- '
' +
- 'The preset password is the empty string, just click login. ' +
- 'Change it in \'_h5ai/private/conf/options.json\'.' +
- '
' +
- '
' +
- 'Show your support with a donation!' +
- '
' +
- '' +
- '
' +
- '
';
+const tplTest =
+ `-
+
+
+
+
`;
+const tplLogin =
+ `
+
+
login
+
logout
+
+ The preset password is the empty string, just click login.
+ Change it in '_h5ai/private/conf/options.json'.
+
+
+ Show your support with a donation!
+
+
+
+
' + setup.INDEX_HREF + ' to your index file list',
+ setup.INDEX_HREF
+ );
- addTest(
- 'Index file found', 'Add ' + setup.INDEX_HREF + ' to your index file list',
- setup.INDEX_HREF
- );
+ addTest(
+ 'Options parsable', 'File options.json is readable and syntax is correct',
+ config.options !== null
+ );
- addTest(
- 'Options parsable', 'File options.json is readable and syntax is correct',
- config.options !== null
- );
+ addTest(
+ 'Types parsable', 'File types.json is readable and syntax is correct',
+ config.types !== null
+ );
- addTest(
- 'Types parsable', 'File types.json is readable and syntax is correct',
- config.types !== null
- );
+ addTest(
+ 'Server software', 'Server is one of apache, lighttpd, nginx or cherokee',
+ setup.HAS_SERVER, setup.SERVER_NAME + ' ' + setup.SERVER_VERSION
+ );
- addTest(
- 'Server software', 'Server is one of apache, lighttpd, nginx or cherokee',
- setup.HAS_SERVER, setup.SERVER_NAME + ' ' + setup.SERVER_VERSION
- );
+ addTest(
+ 'PHP version', 'PHP version >= ' + setup.MIN_PHP_VERSION,
+ true, setup.PHP_VERSION
+ );
- addTest(
- 'PHP version', 'PHP version >= ' + setup.MIN_PHP_VERSION,
- true, setup.PHP_VERSION
- );
+ addTest(
+ 'Public Cache directory', 'Web server has write access',
+ setup.HAS_WRITABLE_CACHE_PUB
+ );
- addTest(
- 'Public Cache directory', 'Web server has write access',
- setup.HAS_WRITABLE_CACHE_PUB
- );
+ addTest(
+ 'Private Cache directory', 'Web server has write access',
+ setup.HAS_WRITABLE_CACHE_PRV
+ );
- addTest(
- 'Private Cache directory', 'Web server has write access',
- setup.HAS_WRITABLE_CACHE_PRV
- );
+ addTest(
+ 'Image thumbs', 'PHP GD extension with JPEG support available',
+ setup.HAS_PHP_JPEG
+ );
- addTest(
- 'Image thumbs', 'PHP GD extension with JPEG support available',
- setup.HAS_PHP_JPEG
- );
+ addTest(
+ 'Use EXIF thumbs', 'PHP EXIF extension available',
+ setup.HAS_PHP_EXIF
+ );
- addTest(
- 'Use EXIF thumbs', 'PHP EXIF extension available',
- setup.HAS_PHP_EXIF
- );
+ addTest(
+ 'Movie thumbs', 'Command line program avconv or ffmpeg available',
+ setup.HAS_CMD_AVCONV || setup.HAS_CMD_FFMPEG
+ );
- addTest(
- 'Movie thumbs', 'Command line program avconv or ffmpeg available',
- setup.HAS_CMD_AVCONV || setup.HAS_CMD_FFMPEG
- );
+ addTest(
+ 'PDF thumbs', 'Command line program convert or gm available',
+ setup.HAS_CMD_CONVERT || setup.HAS_CMD_GM
+ );
- addTest(
- 'PDF thumbs', 'Command line program convert or gm available',
- setup.HAS_CMD_CONVERT || setup.HAS_CMD_GM
- );
+ addTest(
+ 'Shell tar', 'Command line program tar available',
+ setup.HAS_CMD_TAR
+ );
- addTest(
- 'Shell tar', 'Command line program tar available',
- setup.HAS_CMD_TAR
- );
+ addTest(
+ 'Shell zip', 'Command line program zip available',
+ setup.HAS_CMD_ZIP
+ );
- addTest(
- 'Shell zip', 'Command line program zip available',
- setup.HAS_CMD_ZIP
- );
+ addTest(
+ 'Shell du', 'Command line program du available',
+ setup.HAS_CMD_DU
+ );
+}
- addTest(
- 'Shell du', 'Command line program du available',
- setup.HAS_CMD_DU
- );
+function reload() {
+ win.location.reload();
+}
+
+function onLogin() {
+ server.request({
+ action: 'login',
+ pass: jq('#pass').val()
+ }).then(reload);
+}
+
+function onLogout() {
+ server.request({
+ action: 'logout'
+ }).then(reload);
+}
+
+function onKeydown(event) {
+ if (event.which === 13) {
+ onLogin();
}
+}
- function reload() {
- window.location.reload();
+function addSupport() {
+ jq(tplSupport).appendTo('#content');
+}
+
+function addLogin() {
+ jq(tplLogin).appendTo('#content');
+
+ if (setup.AS_ADMIN) {
+ jq('#pass').remove();
+ jq('#login').remove();
+ jq('#logout').on('click', onLogout);
+ } else {
+ jq('#pass').on('keydown', onKeydown).focus();
+ jq('#login').on('click', onLogin);
+ jq('#logout').remove();
}
-
- function onLogin() {
- server.request({
- action: 'login',
- pass: $('#pass').val()
- }, reload);
+ if (config.options.hasCustomPasshash) {
+ jq('#hint').remove();
}
+}
- function onLogout() {
- server.request({
- action: 'logout'
- }, reload);
- }
-
- function onKeydown(event) {
- if (event.which === 13) {
- onLogin();
- }
- }
-
- function addSupport() {
- $(tplSupport).appendTo('#content');
- }
-
- function addLogin() {
- $(tplLogin).appendTo('#content');
-
- if (setup.AS_ADMIN) {
- $('#pass').remove();
- $('#login').remove();
- $('#logout').on('click', onLogout);
- } else {
- $('#pass').on('keydown', onKeydown).focus();
- $('#login').on('click', onLogin);
- $('#logout').remove();
- }
- if (config.options.hasCustomPasshash) {
- $('#hint').remove();
- }
- }
-
- function init() {
- addSupport();
- addLogin();
- addTests();
- }
+function init() {
+ addSupport();
+ addLogin();
+ addTests();
+}
- init();
-});
+init();
diff --git a/src/_h5ai/public/js/lib/model/item.js b/src/_h5ai/public/js/lib/model/item.js
index ff40152f..b00e1b49 100644
--- a/src/_h5ai/public/js/lib/model/item.js
+++ b/src/_h5ai/public/js/lib/model/item.js
@@ -1,226 +1,230 @@
-modulejs.define('model/item', ['_', 'core/event', 'core/location', 'core/server', 'core/settings', 'core/types'], function (_, event, location, server, settings, types) {
- var reEndsWithSlash = /\/$/;
- var reSplitPath = /^(.*\/)([^\/]+\/?)$/;
- var cache = {};
+const {_: lo} = require('../win');
+const location = require('../core/location');
+const server = require('../core/server');
+const settings = require('../core/settings');
+const types = require('../core/types');
- function startsWith(sequence, part) {
- if (!sequence || !sequence.indexOf) {
- return false;
- }
+const reEndsWithSlash = /\/$/;
+const reSplitPath = /^(.*\/)([^\/]+\/?)$/;
+const cache = {};
- return sequence.indexOf(part) === 0;
+
+function startsWith(sequence, part) {
+ if (!sequence || !sequence.indexOf) {
+ return false;
}
- function createLabel(sequence) {
- sequence = sequence.replace(reEndsWithSlash, '');
- try {
- sequence = decodeURIComponent(sequence);
- } catch (e) {/* skip */}
- return sequence;
+ return sequence.indexOf(part) === 0;
+}
+
+function createLabel(sequence) {
+ sequence = sequence.replace(reEndsWithSlash, '');
+ try {
+ sequence = decodeURIComponent(sequence);
+ } catch (e) {/* skip */}
+ return sequence;
+}
+
+function splitPath(sequence) { // eslint-disable-line consistent-return
+ if (sequence === '/') {
+ return {
+ parent: null,
+ name: '/'
+ };
}
- function splitPath(sequence) { // eslint-disable-line consistent-return
- if (sequence === '/') {
- return {
- parent: null,
- name: '/'
- };
+ const match = reSplitPath.exec(sequence);
+ if (match) {
+ const split = {
+ parent: match[1],
+ name: match[2]
+ };
+
+ if (split.parent && !startsWith(split.parent, settings.rootHref)) {
+ split.parent = null;
}
+ return split;
+ }
+}
- var match = reSplitPath.exec(sequence);
- if (match) {
- var split = {
- parent: match[1],
- name: match[2]
- };
+function getItem(options) {
+ if (lo.isString(options)) {
+ options = {href: options};
+ } else if (!options || !lo.isString(options.href)) {
+ return null;
+ }
- if (split.parent && !startsWith(split.parent, settings.rootHref)) {
- split.parent = null;
+ const href = location.forceEncoding(options.href);
+
+ if (!startsWith(href, settings.rootHref)) {
+ return null;
+ }
+
+ const item = cache[href] || new Item(href); // eslint-disable-line no-use-before-define
+
+ if (lo.isNumber(options.time)) {
+ item.time = options.time;
+ }
+ if (lo.isNumber(options.size)) {
+ item.size = options.size;
+ }
+ if (options.managed) {
+ item.isManaged = true;
+ }
+ if (options.fetched) {
+ item.isContentFetched = true;
+ }
+
+ return item;
+}
+
+function removeItem(absHref) {
+ absHref = location.forceEncoding(absHref);
+
+ const item = cache[absHref];
+
+ if (item) {
+ delete cache[absHref];
+ if (item.parent) {
+ delete item.parent.content[item.absHref];
+ }
+ lo.each(item.content, child => {
+ removeItem(child.absHref);
+ });
+ }
+}
+
+function fetchContent(absHref, callback) {
+ const item = getItem(absHref);
+
+ if (!lo.isFunction(callback)) {
+ callback = () => undefined;
+ }
+
+ if (item.isContentFetched) {
+ callback(item);
+ } else {
+ server.request({action: 'get', items: {href: item.absHref, what: 1}}).then(response => {
+ if (response.items) {
+ lo.each(response.items, jsonItem => {
+ getItem(jsonItem);
+ });
}
- return split;
- }
- }
- function getItem(options) {
- if (_.isString(options)) {
- options = {href: options};
- } else if (!options || !_.isString(options.href)) {
- return null;
- }
-
- var href = location.forceEncoding(options.href);
-
- if (!startsWith(href, settings.rootHref)) {
- return null;
- }
-
- var item = cache[href] || new Item(href); // eslint-disable-line no-use-before-define
-
- if (_.isNumber(options.time)) {
- item.time = options.time;
- }
- if (_.isNumber(options.size)) {
- item.size = options.size;
- }
- if (options.managed) {
- item.isManaged = true;
- }
- if (options.fetched) {
- item.isContentFetched = true;
- }
-
- return item;
- }
-
- function removeItem(absHref) {
- absHref = location.forceEncoding(absHref);
-
- var item = cache[absHref];
-
- if (item) {
- delete cache[absHref];
- if (item.parent) {
- delete item.parent.content[item.absHref];
- }
- _.each(item.content, function (child) {
- removeItem(child.absHref);
- });
- }
- }
-
- function fetchContent(absHref, callback) {
- var item = getItem(absHref);
-
- if (!_.isFunction(callback)) {
- callback = function () {};
- }
-
- if (item.isContentFetched) {
callback(item);
- } else {
- server.request({action: 'get', items: {href: item.absHref, what: 1}}, function (response) {
- if (response.items) {
- _.each(response.items, function (jsonItem) {
- getItem(jsonItem);
- });
- }
+ });
+ }
+}
- callback(item);
- });
+
+function Item(absHref) {
+ const split = splitPath(absHref);
+
+ cache[absHref] = this;
+
+ this.absHref = absHref;
+ this.type = types.getType(absHref);
+ this.label = createLabel(absHref === '/' ? location.getDomain() : split.name);
+ this.time = null;
+ this.size = null;
+ this.parent = null;
+ this.isManaged = null;
+ this.content = {};
+
+ if (split.parent) {
+ this.parent = getItem(split.parent);
+ this.parent.content[this.absHref] = this;
+ if (lo.keys(this.parent.content).length > 1) {
+ this.parent.isContentFetched = true;
}
}
+}
+lo.extend(Item.prototype, {
+ isFolder() {
+ return reEndsWithSlash.test(this.absHref);
+ },
- function Item(absHref) {
- var split = splitPath(absHref);
+ isCurrentFolder() {
+ return this.absHref === location.getAbsHref();
+ },
- cache[absHref] = this;
+ isInCurrentFolder() {
+ return Boolean(this.parent) && this.parent.isCurrentFolder();
+ },
- this.absHref = absHref;
- this.type = types.getType(absHref);
- this.label = createLabel(absHref === '/' ? location.getDomain() : split.name);
- this.time = null;
- this.size = null;
- this.parent = null;
- this.isManaged = null;
- this.content = {};
+ isCurrentParentFolder() {
+ const item = getItem(location.getAbsHref());
+ return Boolean(item) && this === item.parent;
+ },
- if (split.parent) {
- this.parent = getItem(split.parent);
- this.parent.content[this.absHref] = this;
- if (_.keys(this.parent.content).length > 1) {
- this.parent.isContentFetched = true;
- }
+ isDomain() {
+ return this.absHref === '/';
+ },
+
+ isRoot() {
+ return this.absHref === settings.rootHref;
+ },
+
+ isEmpty() {
+ return lo.keys(this.content).length === 0;
+ },
+
+ fetchContent(callback) {
+ return fetchContent(this.absHref, callback);
+ },
+
+ getCrumb() {
+ let item = this; // eslint-disable-line consistent-this
+ const crumb = [item];
+
+ while (item.parent) {
+ item = item.parent;
+ crumb.unshift(item);
}
+
+ return crumb;
+ },
+
+ getSubfolders() {
+ return lo.sortBy(lo.filter(this.content, item => {
+ return item.isFolder();
+ }), item => {
+ return item.label.toLowerCase();
+ });
+ },
+
+ getStats() {
+ let folders = 0;
+ let files = 0;
+
+ lo.each(this.content, item => {
+ if (item.isFolder()) {
+ folders += 1;
+ } else {
+ files += 1;
+ }
+ });
+
+ let depth = 0;
+ let item = this; // eslint-disable-line consistent-this
+
+ while (item.parent) {
+ depth += 1;
+ item = item.parent;
+ }
+
+ return {
+ folders,
+ files,
+ depth
+ };
}
-
- _.extend(Item.prototype, {
-
- isFolder: function () {
- return reEndsWithSlash.test(this.absHref);
- },
-
- isCurrentFolder: function () {
- return this.absHref === location.getAbsHref();
- },
-
- isInCurrentFolder: function () {
- return Boolean(this.parent) && this.parent.isCurrentFolder();
- },
-
- isCurrentParentFolder: function () {
- var item = getItem(location.getAbsHref());
- return Boolean(item) && this === item.parent;
- },
-
- isDomain: function () {
- return this.absHref === '/';
- },
-
- isRoot: function () {
- return this.absHref === settings.rootHref;
- },
-
- isEmpty: function () {
- return _.keys(this.content).length === 0;
- },
-
- fetchContent: function (callback) {
- return fetchContent(this.absHref, callback);
- },
-
- getCrumb: function () {
- var item = this; // eslint-disable-line consistent-this
- var crumb = [item];
-
- while (item.parent) {
- item = item.parent;
- crumb.unshift(item);
- }
-
- return crumb;
- },
-
- getSubfolders: function () {
- return _.sortBy(_.filter(this.content, function (item) {
- return item.isFolder();
- }), function (item) {
- return item.label.toLowerCase();
- });
- },
-
- getStats: function () {
- var folders = 0;
- var files = 0;
-
- _.each(this.content, function (item) {
- if (item.isFolder()) {
- folders += 1;
- } else {
- files += 1;
- }
- });
-
- var depth = 0;
- var item = this; // eslint-disable-line consistent-this
-
- while (item.parent) {
- depth += 1;
- item = item.parent;
- }
-
- return {
- folders: folders,
- files: files,
- depth: depth
- };
- }
- });
-
-
- return {
- get: getItem,
- remove: removeItem
- };
});
+
+
+module.exports = {
+ get: getItem,
+ remove: removeItem
+};
diff --git a/src/_h5ai/public/js/lib/view/content.js b/src/_h5ai/public/js/lib/view/content.js
index 2a133f61..9b5ea1f8 100644
--- a/src/_h5ai/public/js/lib/view/content.js
+++ b/src/_h5ai/public/js/lib/view/content.js
@@ -1,7 +1,8 @@
-modulejs.define('view/content', ['$', 'view/mainrow'], function ($, mainrow) {
- var $el = $('').appendTo(mainrow.$el);
+const {jQuery: jq} = require('../win');
+const mainrow = require('./mainrow');
- return {
- $el: $el
- };
-});
+const $el = jq('').appendTo(mainrow.$el);
+
+module.exports = {
+ $el
+};
diff --git a/src/_h5ai/public/js/lib/view/mainrow.js b/src/_h5ai/public/js/lib/view/mainrow.js
index a150a39f..a711c17c 100644
--- a/src/_h5ai/public/js/lib/view/mainrow.js
+++ b/src/_h5ai/public/js/lib/view/mainrow.js
@@ -1,7 +1,8 @@
-modulejs.define('view/mainrow', ['$', 'view/root'], function ($, root) {
- var $el = $('').appendTo(root.$el);
+const {jQuery: jq} = require('../win');
+const root = require('./root');
- return {
- $el: $el
- };
-});
+const $el = jq('').appendTo(root.$el);
+
+module.exports = {
+ $el
+};
diff --git a/src/_h5ai/public/js/lib/view/notification.js b/src/_h5ai/public/js/lib/view/notification.js
index 0d78c366..58022c1e 100644
--- a/src/_h5ai/public/js/lib/view/notification.js
+++ b/src/_h5ai/public/js/lib/view/notification.js
@@ -1,16 +1,17 @@
-modulejs.define('view/notification', ['$', 'view/root'], function ($, root) {
- var $el = $('').hide().appendTo(root.$el);
+const {jQuery: jq} = require('../win');
+const root = require('./root');
- function set(content) {
- if (content) {
- $el.stop(true, true).html(content).fadeIn(400);
- } else {
- $el.stop(true, true).fadeOut(400);
- }
+const $el = jq('').hide().appendTo(root.$el);
+
+function set(content) {
+ if (content) {
+ $el.stop(true, true).html(content).fadeIn(400);
+ } else {
+ $el.stop(true, true).fadeOut(400);
}
+}
- return {
- $el: $el,
- set: set
- };
-});
+module.exports = {
+ $el,
+ set
+};
diff --git a/src/_h5ai/public/js/lib/view/root.js b/src/_h5ai/public/js/lib/view/root.js
index 5f98a092..4c4bfad7 100644
--- a/src/_h5ai/public/js/lib/view/root.js
+++ b/src/_h5ai/public/js/lib/view/root.js
@@ -1,9 +1,9 @@
-modulejs.define('view/root', ['$'], function ($) {
- var $el = $('body').attr('id', 'root');
+const {jQuery: jq} = require('../win');
- $('#fallback, #fallback-hints').remove();
+const $el = jq('body').attr('id', 'root');
- return {
- $el: $el
- };
-});
+jq('#fallback, #fallback-hints').remove();
+
+module.exports = {
+ $el
+};
diff --git a/src/_h5ai/public/js/lib/view/sidebar.js b/src/_h5ai/public/js/lib/view/sidebar.js
index 56c6eba9..ad8f71b8 100644
--- a/src/_h5ai/public/js/lib/view/sidebar.js
+++ b/src/_h5ai/public/js/lib/view/sidebar.js
@@ -1,40 +1,45 @@
-modulejs.define('view/sidebar', ['$', 'core/resource', 'core/store', 'view/mainrow', 'view/topbar'], function ($, resource, store, mainrow, topbar) {
- var storekey = 'sidebarIsVisible';
- var tplSidebar = '';
- var tplToggle =
- '';
- var $sidebar = $(tplSidebar);
- var $toggle = $(tplToggle);
- var $img = $toggle.find('img');
+const {jQuery: jq} = require('../win');
+const resource = require('../core/resource');
+const store = require('../core/store');
+const mainrow = require('./mainrow');
+const topbar = require('./topbar');
- function update(toggle) {
- var isVisible = store.get(storekey);
+const storekey = 'sidebarIsVisible';
+const tplSidebar = '';
+const tplToggle =
+ ``;
+const $sidebar = jq(tplSidebar);
+const $toggle = jq(tplToggle);
+const $img = $toggle.find('img');
- if (toggle) {
- isVisible = !isVisible;
- store.put(storekey, isVisible);
- }
- if (isVisible) {
- $toggle.addClass('active');
- $img.attr('src', resource.image('back'));
- $sidebar.show();
- } else {
- $toggle.removeClass('active');
- $img.attr('src', resource.image('sidebar'));
- $sidebar.hide();
- }
+function update(toggle) {
+ let isVisible = store.get(storekey);
+
+ if (toggle) {
+ isVisible = !isVisible;
+ store.put(storekey, isVisible);
}
+ if (isVisible) {
+ $toggle.addClass('active');
+ $img.attr('src', resource.image('back'));
+ $sidebar.show();
+ } else {
+ $toggle.removeClass('active');
+ $img.attr('src', resource.image('sidebar'));
+ $sidebar.hide();
+ }
+}
- $sidebar.appendTo(mainrow.$el);
- $toggle.appendTo(topbar.$toolbar).on('click', function () { update(true); });
- update(false);
- return {
- $el: $sidebar
- };
-});
+$sidebar.appendTo(mainrow.$el);
+$toggle.appendTo(topbar.$toolbar).on('click', () => update(true));
+update();
+
+module.exports = {
+ $el: $sidebar
+};
diff --git a/src/_h5ai/public/js/lib/view/topbar.js b/src/_h5ai/public/js/lib/view/topbar.js
index d3bd47c4..a4197be9 100644
--- a/src/_h5ai/public/js/lib/view/topbar.js
+++ b/src/_h5ai/public/js/lib/view/topbar.js
@@ -1,18 +1,19 @@
-modulejs.define('view/topbar', ['$', 'view/root'], function ($, root) {
- var tplTopbar =
- '';
- var $el = $(tplTopbar).appendTo(root.$el);
+const {jQuery: jq} = require('../win');
+const root = require('./root');
- return {
- $el: $el,
- $toolbar: $el.find('#toolbar'),
- $flowbar: $el.find('#flowbar')
- };
-});
+const tplTopbar =
+ ``;
+const $el = jq(tplTopbar).appendTo(root.$el);
+
+module.exports = {
+ $el,
+ $toolbar: $el.find('#toolbar'),
+ $flowbar: $el.find('#flowbar')
+};
diff --git a/src/_h5ai/public/js/lib/view/view.js b/src/_h5ai/public/js/lib/view/view.js
index bd859f1e..7c553942 100644
--- a/src/_h5ai/public/js/lib/view/view.js
+++ b/src/_h5ai/public/js/lib/view/view.js
@@ -1,292 +1,299 @@
-modulejs.define('view/view', ['_', '$', 'core/event', 'core/format', 'core/location', 'core/resource', 'core/settings', 'core/store', 'view/content'], function (_, $, event, format, location, resource, allsettings, store, content) {
- var modes = ['details', 'grid', 'icons'];
- var sizes = [20, 40, 60, 80, 100, 150, 200, 250, 300, 350, 400];
- var settings = _.extend({
- binaryPrefix: false,
- hideFolders: false,
- hideParentFolder: false,
- modes: modes,
- setParentFolderLabels: false,
- sizes: sizes
- }, allsettings.view);
- var sortedSizes = settings.sizes.sort(function (a, b) { return a - b; });
- var checkedModes = _.intersection(settings.modes, modes);
- var storekey = 'view';
- var tplView =
- '';
- var tplItem =
- '- ' +
- '' +
- '
![]()
' +
- '![]()
' +
- '' +
- '' +
- '' +
- '' +
- ' ';
- var $view = $(tplView);
- var $items = $view.find('#items');
- var $hint = $view.find('#view-hint');
+const {jQuery: jq, _: lo} = require('../win');
+const event = require('../core/event');
+const format = require('../core/format');
+const location = require('../core/location');
+const resource = require('../core/resource');
+const store = require('../core/store');
+const allsettings = require('../core/settings');
+const content = require('./content');
+
+const modes = ['details', 'grid', 'icons'];
+const sizes = [20, 40, 60, 80, 100, 150, 200, 250, 300, 350, 400];
+const settings = lo.extend({
+ binaryPrefix: false,
+ hideFolders: false,
+ hideParentFolder: false,
+ modes,
+ setParentFolderLabels: false,
+ sizes
+}, allsettings.view);
+const sortedSizes = settings.sizes.sort((a, b) => a - b);
+const checkedModes = lo.intersection(settings.modes, modes);
+const storekey = 'view';
+const tplView =
+ ``;
+const tplItem =
+ `-
+
+
![]()
+ ![]()
+
+
+
+
+ `;
+const $view = jq(tplView);
+const $items = $view.find('#items');
+const $hint = $view.find('#view-hint');
- function cropSize(size, min, max) {
- return Math.min(max, Math.max(min, size));
- }
+function cropSize(size, min, max) {
+ return Math.min(max, Math.max(min, size));
+}
- function createStyles(size) {
- var dsize = cropSize(size, 20, 80);
- var gsize = cropSize(size, 40, 160);
- var isize = cropSize(size, 80, 1000);
- var ilsize = Math.round(isize * 4 / 3);
- var rules = [
- '#view.view-details.view-size-' + size + ' .item .label { line-height: ' + (dsize + 14) + 'px !important; }',
- '#view.view-details.view-size-' + size + ' .item .date { line-height: ' + (dsize + 14) + 'px !important; }',
- '#view.view-details.view-size-' + size + ' .item .size { line-height: ' + (dsize + 14) + 'px !important; }',
- '#view.view-details.view-size-' + size + ' .square { width: ' + dsize + 'px !important; height: ' + dsize + 'px !important; }',
- '#view.view-details.view-size-' + size + ' .square img { width: ' + dsize + 'px !important; height: ' + dsize + 'px !important; }',
- '#view.view-details.view-size-' + size + ' .label { margin-left: ' + (dsize + 32) + 'px !important; }',
+function createStyles(size) {
+ const dsize = cropSize(size, 20, 80);
+ const gsize = cropSize(size, 40, 160);
+ const isize = cropSize(size, 80, 1000);
+ const ilsize = Math.round(isize * 4 / 3);
+ const rules = [
+ `#view.view-details.view-size-${size} .item .label {line-height: ${dsize + 14}px !important;}`,
+ `#view.view-details.view-size-${size} .item .date {line-height: ${dsize + 14}px !important;}`,
+ `#view.view-details.view-size-${size} .item .size {line-height: ${dsize + 14}px !important;}`,
+ `#view.view-details.view-size-${size} .square {width: ${dsize}px !important; height: ${dsize}px !important;}`,
+ `#view.view-details.view-size-${size} .square img {width: ${dsize}px !important; height: ${dsize}px !important;}`,
+ `#view.view-details.view-size-${size} .label {margin-left: ${dsize + 32}px !important;}`,
- '#view.view-grid.view-size-' + size + ' .item .label { line-height: ' + gsize + 'px !important; }',
- '#view.view-grid.view-size-' + size + ' .square { width: ' + gsize + 'px !important; height: ' + gsize + 'px !important; }',
- '#view.view-grid.view-size-' + size + ' .square img { width: ' + gsize + 'px !important; height: ' + gsize + 'px !important; }',
+ `#view.view-grid.view-size-${size} .item .label {line-height: ${gsize}px !important;}`,
+ `#view.view-grid.view-size-${size} .square {width: ${gsize}px !important; height: ${gsize}px !important;}`,
+ `#view.view-grid.view-size-${size} .square img {width: ${gsize}px !important; height: ${gsize}px !important;}`,
- '#view.view-icons.view-size-' + size + ' .item { width: ' + ilsize + 'px !important; }',
- '#view.view-icons.view-size-' + size + ' .landscape { width: ' + ilsize + 'px !important; height: ' + isize + 'px !important; }',
- '#view.view-icons.view-size-' + size + ' .landscape img { width: ' + isize + 'px !important; height: ' + isize + 'px !important; }',
- '#view.view-icons.view-size-' + size + ' .landscape .thumb { width: ' + ilsize + 'px !important; }'
- ];
+ `#view.view-icons.view-size-${size} .item {width: ${ilsize}px !important;}`,
+ `#view.view-icons.view-size-${size} .landscape {width: ${ilsize}px !important; height: ${isize}px !important;}`,
+ `#view.view-icons.view-size-${size} .landscape img {width: ${isize}px !important; height: ${isize}px !important;}`,
+ `#view.view-icons.view-size-${size} .landscape .thumb {width: ${ilsize}px !important;}`
+ ];
- return rules.join('\n');
- }
+ return rules.join('\n');
+}
- function addCssStyles() {
- var styles = _.map(sortedSizes, function (size) { return createStyles(size); });
- styles.push('#view .icon img { max-width: ' + settings.maxIconSize + 'px; max-height: ' + settings.maxIconSize + 'px; }');
- $('').text(styles.join('\n')).appendTo('head');
- }
+function addCssStyles() {
+ const styles = lo.map(sortedSizes, size => createStyles(size));
+ styles.push(`#view .icon img {max-width: ${settings.maxIconSize}px; max-height: ${settings.maxIconSize}px;}`);
+ jq('').text(styles.join('\n')).appendTo('head');
+}
- function set(mode, size) {
- var stored = store.get(storekey);
+function set(mode, size) {
+ const stored = store.get(storekey);
- mode = mode || stored && stored.mode;
- size = size || stored && stored.size;
- mode = _.includes(settings.modes, mode) ? mode : settings.modes[0];
- size = _.includes(settings.sizes, size) ? size : settings.sizes[0];
- store.put(storekey, {mode: mode, size: size});
+ mode = mode || stored && stored.mode;
+ size = size || stored && stored.size;
+ mode = lo.includes(settings.modes, mode) ? mode : settings.modes[0];
+ size = lo.includes(settings.sizes, size) ? size : settings.sizes[0];
+ store.put(storekey, {mode, size});
- _.each(checkedModes, function (m) {
- if (m === mode) {
- $view.addClass('view-' + m);
- } else {
- $view.removeClass('view-' + m);
- }
- });
-
- _.each(sortedSizes, function (s) {
- if (s === size) {
- $view.addClass('view-size-' + s);
- } else {
- $view.removeClass('view-size-' + s);
- }
- });
-
- event.pub('view.mode.changed', mode, size);
- }
-
- function getModes() {
- return checkedModes;
- }
-
- function getSizes() {
- return sortedSizes;
- }
-
- function getMode() {
- return store.get(storekey).mode;
- }
-
- function setMode(mode) {
- set(mode, null);
- }
-
- function getSize() {
- return store.get(storekey).size;
- }
-
- function setSize(size) {
- set(null, size);
- }
-
- function createHtml(item) {
- var $html = $(tplItem);
- var $a = $html.find('a');
- var $iconImg = $html.find('.icon img');
- var $label = $html.find('.label');
- var $date = $html.find('.date');
- var $size = $html.find('.size');
-
- $html
- .addClass(item.isFolder() ? 'folder' : 'file')
- .data('item', item);
-
- location.setLink($a, item);
-
- $label.text(item.label).attr('title', item.label);
- $date.data('time', item.time).text(format.formatDate(item.time));
- $size.data('bytes', item.size).text(format.formatSize(item.size));
- item.icon = resource.icon(item.type);
-
- if (item.isFolder() && !item.isManaged) {
- $html.addClass('page');
- item.icon = resource.icon('folder-page');
- }
-
- if (item.isCurrentParentFolder()) {
- item.icon = resource.icon('folder-parent');
- if (!settings.setParentFolderLabels) {
- $label.addClass('l10n-parentDirectory');
- }
- $html.addClass('folder-parent');
- }
- $iconImg.attr('src', item.icon).attr('alt', item.type);
-
- item.$view = $html;
-
- return $html;
- }
-
- function onMouseenter() {
- var item = $(this).closest('.item').data('item');
- event.pub('item.mouseenter', item);
- }
-
- function onMouseleave() {
- var item = $(this).closest('.item').data('item');
- event.pub('item.mouseleave', item);
- }
-
- function checkHint() {
- var hasNoItems = $items.find('.item').not('.folder-parent').length === 0;
-
- if (hasNoItems) {
- $hint.show();
+ lo.each(checkedModes, m => {
+ if (m === mode) {
+ $view.addClass('view-' + m);
} else {
- $hint.hide();
+ $view.removeClass('view-' + m);
}
- }
+ });
- function setItems(items) {
- var removed = _.map($items.find('.item'), function (item) {
- return $(item).data('item');
- });
-
- $items.find('.item').remove();
-
- _.each(items, function (e) {
- $items.append(createHtml(e));
- });
-
- content.$el.scrollLeft(0).scrollTop(0);
- checkHint();
- event.pub('view.changed', items, removed);
- }
-
- function changeItems(add, remove) {
- _.each(add, function (item) {
- createHtml(item).hide().appendTo($items).fadeIn(400);
- });
-
- _.each(remove, function (item) {
- item.$view.fadeOut(400, function () {
- item.$view.remove();
- });
- });
-
- checkHint();
- event.pub('view.changed', add, remove);
- }
-
- function setHint(l10nKey) {
- $hint.removeClass().addClass('l10n-' + l10nKey);
- checkHint();
- }
-
- function onLocationChanged(item) {
- if (!item) {
- item = location.getItem();
+ lo.each(sortedSizes, s => {
+ if (s === size) {
+ $view.addClass('view-size-' + s);
+ } else {
+ $view.removeClass('view-size-' + s);
}
+ });
- var items = [];
+ event.pub('view.mode.changed', mode, size);
+}
- if (item.parent && !settings.hideParentFolder) {
- items.push(item.parent);
+function getModes() {
+ return checkedModes;
+}
+
+function getSizes() {
+ return sortedSizes;
+}
+
+function getMode() {
+ return store.get(storekey).mode;
+}
+
+function setMode(mode) {
+ set(mode, null);
+}
+
+function getSize() {
+ return store.get(storekey).size;
+}
+
+function setSize(size) {
+ set(null, size);
+}
+
+function createHtml(item) {
+ const $html = jq(tplItem);
+ const $a = $html.find('a');
+ const $iconImg = $html.find('.icon img');
+ const $label = $html.find('.label');
+ const $date = $html.find('.date');
+ const $size = $html.find('.size');
+
+ $html
+ .addClass(item.isFolder() ? 'folder' : 'file')
+ .data('item', item);
+
+ location.setLink($a, item);
+
+ $label.text(item.label).attr('title', item.label);
+ $date.data('time', item.time).text(format.formatDate(item.time));
+ $size.data('bytes', item.size).text(format.formatSize(item.size));
+ item.icon = resource.icon(item.type);
+
+ if (item.isFolder() && !item.isManaged) {
+ $html.addClass('page');
+ item.icon = resource.icon('folder-page');
+ }
+
+ if (item.isCurrentParentFolder()) {
+ item.icon = resource.icon('folder-parent');
+ if (!settings.setParentFolderLabels) {
+ $label.addClass('l10n-parentDirectory');
}
-
- _.each(item.content, function (child) {
- if (!(child.isFolder() && settings.hideFolders)) {
- items.push(child);
- }
- });
-
- setHint('empty');
- setItems(items);
+ $html.addClass('folder-parent');
}
+ $iconImg.attr('src', item.icon).attr('alt', item.type);
- function onLocationRefreshed(item, added, removed) {
- var add = [];
+ item.$view = $html;
- _.each(added, function (child) {
- if (!(child.isFolder() && settings.hideFolders)) {
- add.push(child);
- }
- });
+ return $html;
+}
- setHint('empty');
- changeItems(add, removed);
- }
+function onMouseenter(ev) {
+ const item = jq(ev.currentTarget).closest('.item').data('item');
+ event.pub('item.mouseenter', item);
+}
- function init() {
- addCssStyles();
- set();
+function onMouseleave(ev) {
+ const item = jq(ev.currentTarget).closest('.item').data('item');
+ event.pub('item.mouseleave', item);
+}
- $view.appendTo(content.$el);
+function checkHint() {
+ const hasNoItems = $items.find('.item').not('.folder-parent').length === 0;
+
+ if (hasNoItems) {
+ $hint.show();
+ } else {
$hint.hide();
+ }
+}
- format.setDefaultMetric(settings.binaryPrefix);
+function setItems(items) {
+ const removed = lo.map($items.find('.item'), item => {
+ return jq(item).data('item');
+ });
- $items
- .on('mouseenter', '.item a', onMouseenter)
- .on('mouseleave', '.item a', onMouseleave);
+ $items.find('.item').remove();
- event.sub('location.changed', onLocationChanged);
- event.sub('location.refreshed', onLocationRefreshed);
+ lo.each(items, e => {
+ $items.append(createHtml(e));
+ });
+
+ content.$el.scrollLeft(0).scrollTop(0);
+ checkHint();
+ event.pub('view.changed', items, removed);
+}
+
+function changeItems(add, remove) {
+ lo.each(add, item => {
+ createHtml(item).hide().appendTo($items).fadeIn(400);
+ });
+
+ lo.each(remove, item => {
+ item.$view.fadeOut(400, () => {
+ item.$view.remove();
+ });
+ });
+
+ checkHint();
+ event.pub('view.changed', add, remove);
+}
+
+function setHint(l10nKey) {
+ $hint.removeClass().addClass('l10n-' + l10nKey);
+ checkHint();
+}
+
+function onLocationChanged(item) {
+ if (!item) {
+ item = location.getItem();
}
+ const items = [];
- init();
+ if (item.parent && !settings.hideParentFolder) {
+ items.push(item.parent);
+ }
- return {
- $el: $view,
- $items: $items,
- setItems: setItems,
- changeItems: changeItems,
- setLocation: onLocationChanged,
- setHint: setHint,
- getModes: getModes,
- getMode: getMode,
- setMode: setMode,
- getSizes: getSizes,
- getSize: getSize,
- setSize: setSize
- };
-});
+ lo.each(item.content, child => {
+ if (!(child.isFolder() && settings.hideFolders)) {
+ items.push(child);
+ }
+ });
+
+ setHint('empty');
+ setItems(items);
+}
+
+function onLocationRefreshed(item, added, removed) {
+ const add = [];
+
+ lo.each(added, child => {
+ if (!(child.isFolder() && settings.hideFolders)) {
+ add.push(child);
+ }
+ });
+
+ setHint('empty');
+ changeItems(add, removed);
+}
+
+function init() {
+ addCssStyles();
+ set();
+
+ $view.appendTo(content.$el);
+ $hint.hide();
+
+ format.setDefaultMetric(settings.binaryPrefix);
+
+ $items
+ .on('mouseenter', '.item a', onMouseenter)
+ .on('mouseleave', '.item a', onMouseleave);
+
+ event.sub('location.changed', onLocationChanged);
+ event.sub('location.refreshed', onLocationRefreshed);
+}
+
+
+init();
+
+module.exports = {
+ $el: $view,
+ $items,
+ setItems,
+ changeItems,
+ setLocation: onLocationChanged,
+ setHint,
+ getModes,
+ getMode,
+ setMode,
+ getSizes,
+ getSize,
+ setSize
+};
diff --git a/src/_h5ai/public/js/lib/view/viewmode.js b/src/_h5ai/public/js/lib/view/viewmode.js
index f361ed5a..67154953 100644
--- a/src/_h5ai/public/js/lib/view/viewmode.js
+++ b/src/_h5ai/public/js/lib/view/viewmode.js
@@ -1,91 +1,98 @@
-modulejs.define('view/viewmode', ['_', '$', 'core/event', 'core/resource', 'core/settings', 'view/sidebar', 'view/topbar', 'view/view'], function (_, $, event, resource, allsettings, sidebar, topbar, view) {
- var settings = _.extend({
- modeToggle: false
- }, allsettings.view);
- var tplSettings =
- 'View
';
- var tplMode =
- '';
- var tplSize =
- '';
- var tplToggle =
- '';
- var modes;
- var sizes;
+const {jQuery: jq, _: lo} = require('../win');
+const event = require('../core/event');
+const resource = require('../core/resource');
+const allsettings = require('../core/settings');
+const sidebar = require('./sidebar');
+const topbar = require('./topbar');
+const view = require('./view');
- function onChanged(mode, size) {
- $('#viewmode-settings .mode').removeClass('active');
- $('#viewmode-' + mode).addClass('active');
- $('#viewmode-size').val(_.indexOf(sizes, size));
+const settings = lo.extend({
+ modeToggle: false
+}, allsettings.view);
+const tplSettings =
+ 'View
';
+const tplMode =
+ ``;
+const tplSize =
+ '';
+const tplToggle =
+ ``;
+let modes;
+let sizes;
- if (settings.modeToggle === 'next') {
- mode = modes[(modes.indexOf(mode) + 1) % modes.length];
- }
- $('#viewmode-toggle img').attr('src', resource.image('view-' + mode));
+
+function onChanged(mode, size) {
+ jq('#viewmode-settings .mode').removeClass('active');
+ jq('#viewmode-' + mode).addClass('active');
+ jq('#viewmode-size').val(lo.indexOf(sizes, size));
+
+ if (settings.modeToggle === 'next') {
+ mode = modes[(modes.indexOf(mode) + 1) % modes.length];
+ }
+ jq('#viewmode-toggle img').attr('src', resource.image('view-' + mode));
+}
+
+function addSettings() {
+ if (modes.length < 2 && sizes.length < 2) {
+ return;
}
- function addSettings() {
- if (modes.length < 2 && sizes.length < 2) {
- return;
- }
+ const $viewBlock = jq(tplSettings);
- var $viewBlock = $(tplSettings);
-
- if (modes.length > 1) {
- _.each(modes, function (mode) {
- $(tplMode.replace(/\[MODE\]/g, mode))
- .on('click', function () {
- view.setMode(mode);
- })
- .appendTo($viewBlock);
- });
- }
-
- if (sizes.length > 1) {
- var max = sizes.length - 1;
- $(tplSize)
- .prop('max', max).attr('max', max)
- .on('input change', function (ev) {
- view.setSize(sizes[ev.target.valueAsNumber]);
+ if (modes.length > 1) {
+ lo.each(modes, mode => {
+ jq(tplMode.replace(/\[MODE\]/g, mode))
+ .on('click', () => {
+ view.setMode(mode);
})
.appendTo($viewBlock);
- }
-
- $viewBlock.appendTo(sidebar.$el);
+ });
}
- function onToggle() {
- var mode = view.getMode();
- var nextIdx = (modes.indexOf(mode) + 1) % modes.length;
- var nextMode = modes[nextIdx];
-
- view.setMode(nextMode);
+ if (sizes.length > 1) {
+ const max = sizes.length - 1;
+ jq(tplSize)
+ .prop('max', max).attr('max', max)
+ .on('input change', ev => {
+ view.setSize(sizes[ev.target.valueAsNumber]);
+ })
+ .appendTo($viewBlock);
}
- function addToggle() {
- if (settings.modeToggle && modes.length > 1) {
- $(tplToggle)
- .on('click', onToggle)
- .appendTo(topbar.$toolbar);
- }
+ $viewBlock.appendTo(sidebar.$el);
+}
+
+function onToggle() {
+ const mode = view.getMode();
+ const nextIdx = (modes.indexOf(mode) + 1) % modes.length;
+ const nextMode = modes[nextIdx];
+
+ view.setMode(nextMode);
+}
+
+function addToggle() {
+ if (settings.modeToggle && modes.length > 1) {
+ jq(tplToggle)
+ .on('click', onToggle)
+ .appendTo(topbar.$toolbar);
}
+}
- function init() {
- modes = view.getModes();
- sizes = view.getSizes();
+function init() {
+ modes = view.getModes();
+ sizes = view.getSizes();
- addSettings();
- addToggle();
- onChanged(view.getMode(), view.getSize());
+ addSettings();
+ addToggle();
+ onChanged(view.getMode(), view.getSize());
- event.sub('view.mode.changed', onChanged);
- }
+ event.sub('view.mode.changed', onChanged);
+}
- init();
-});
+init();
diff --git a/src/_h5ai/public/js/lib/win.js b/src/_h5ai/public/js/lib/win.js
new file mode 100644
index 00000000..e6798665
--- /dev/null
+++ b/src/_h5ai/public/js/lib/win.js
@@ -0,0 +1,23 @@
+const win = window; // eslint-disable-line no-undef
+
+if (typeof win !== 'object' || win.window !== win || !win.document) {
+ throw new Error('no-window');
+}
+
+const noBrowser = 'no-browser';
+const doc = win.document;
+const docEl = doc.documentElement;
+docEl.className = '';
+
+function assert(expr, hint) {
+ if (!expr) {
+ docEl.className = noBrowser;
+ throw new Error(`${noBrowser}: ${hint}`);
+ }
+}
+
+assert(!doc.getElementById(noBrowser), 'ie<10');
+assert(typeof Object.assign === 'function', 'assign');
+assert(typeof Promise === 'function', 'promise');
+
+module.exports = win;
diff --git a/src/_h5ai/public/js/scripts.js b/src/_h5ai/public/js/scripts.js
index ef33d0e9..e84f6795 100644
--- a/src/_h5ai/public/js/scripts.js
+++ b/src/_h5ai/public/js/scripts.js
@@ -1,30 +1 @@
-(function () {
- var doc = document;
- var el = doc.documentElement;
- var id = 'no-browser';
- el.className = '';
- if (doc.getElementById(id)) {
- el.className = id;
- throw id;
- }
-}());
-
-// @include 'vendor/jquery-*.js'
-// @include 'vendor/lodash-*.js'
-// @include 'vendor/marked-*.js'
-// @include 'vendor/modulejs-*.js'
-// @include 'vendor/prism-*.js'
-
-(function () {
- 'use strict'; // eslint-disable-line strict
-
- var win = window;
- modulejs.define('_', function () { return win._; });
- modulejs.define('$', function () { return win.jQuery; });
- modulejs.define('marked', function () { return win.marked; });
- modulejs.define('prism', function () { return win.Prism; });
-
- // @include 'lib/**/*.js'
-
- modulejs.require('boot');
-}());
+require('./lib/init');
diff --git a/src/_h5ai/public/js/vendor/modulejs-1.14.0.min.js b/src/_h5ai/public/js/vendor/modulejs-1.14.0.min.js
deleted file mode 100644
index dbe9557c..00000000
--- a/src/_h5ai/public/js/vendor/modulejs-1.14.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! modulejs v1.14.0 - https://larsjung.de/modulejs/ */
-!function(n,r){"object"==typeof exports&&"object"==typeof module?module.exports=r():"function"==typeof define&&define.amd?define([],r):"object"==typeof exports?exports.modulejs=r():n.modulejs=r()}(this,function(){return function(n){function r(t){if(e[t])return e[t].exports;var i=e[t]={exports:{},id:t,loaded:!1};return n[t].call(i.exports,i,i.exports,r),i.loaded=!0,i.exports}var e={};return r.m=n,r.c=e,r.p="",r(0)}([function(n,r){"use strict";var e=Object.prototype,t=function(n){return function(r){return e.toString.call(r)==="[object "+n+"]"}},i=t("Array"),o=t("Function"),u=t("String"),s=function(n,r){return void 0!==n&&null!==n&&e.hasOwnProperty.call(n,r)},f=function(n,r){if(n&&n.length)for(var e=0,t=n.length;t>e;e+=1)r(n[e],e,n);else for(var i in n)s(n,i)&&r(n[i],i,n)},c=function(n,r){if(n&&n.length)for(var e=0,t=n.length;t>e;e+=1)if(n[e]===r)return!0;return!1},a=function(n){var r=[];return f(n,function(n){c(r,n)||r.push(n)}),r},d=function(n,r){if(!n)throw new Error("[modulejs] "+r)},p=function l(){var n={},r={},e=function y(e,t,i){d(u(e),"id must be string: "+e);var o=t===!0,p=(o?void 0:t)||r;if(!o&&s(p,e))return p[e];var l=n[e];d(l,"id not defined: "+e),i=(i||[]).slice(),i.push(e);var v=[];if(f(l.deps,function(n){d(!c(i,n),"circular dependencies: "+n+" in "+i),o?(v=v.concat(y(n,t,i)),v.push(n)):v.push(y(n,t,i))}),o)return a(v);var h=l.fn.apply(void 0,v);return p[e]=h,h},t=function(r,e,t){if(void 0===t){var f=[[],e];e=f[0],t=f[1]}d(u(r),"id must be string: "+r),d(!s(n,r),"id already defined: "+r),d(i(e),"deps must be array: "+r),n[r]={id:r,deps:e,fn:o(t)?t:function(){return t}}},p=function(n,r){return e(n,r)},v=function(){var t={};return f(n,function(n,i){t[i]={deps:n.deps.slice(),reqs:e(i,!0),init:s(r,i)}}),f(n,function(r,e){var i=[];f(n,function(n,r){c(t[r].reqs,e)&&i.push(r)}),t[e].reqd=i}),t},h=function(n){var r="\n";return f(v(),function(e,t){var i=n?e.reqd:e.reqs;r+=(e.init?"* ":" ")+t+" -> [ "+i.join(", ")+" ]\n"}),r};return{create:l,define:t,log:h,require:p,state:v,_private:{assert:d,contains:c,definitions:n,each:f,has:s,instances:r,isArray:i,isFunction:o,isString:u,resolve:e,uniq:a}}};n.exports=p()}])});
\ No newline at end of file