' +
'' +
' + ')
' +
'' +
@@ -20,7 +20,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
magicSequence = '=h5ai=',
- update = function (entry) {
+ update = function (item) {
var $html = $(template),
$indicator = $html.find('.indicator'),
@@ -29,26 +29,26 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
$label = $html.find('.label');
$html
- .addClass(entry.isFolder() ? 'folder' : 'file')
- .data('entry', entry)
- .data('status', entry.status);
+ .addClass(item.isFolder() ? 'folder' : 'file')
+ .data('item', item)
+ .data('status', item.status);
- location.setLink($a, entry);
- $img.attr('src', resource.icon(entry.type));
- $label.text(entry.label);
+ location.setLink($a, item);
+ $img.attr('src', resource.icon(item.type));
+ $label.text(item.label);
- if (entry.isFolder()) {
+ if (item.isFolder()) {
- var subfolders = entry.getSubfolders();
+ var subfolders = item.getSubfolders();
// indicator
- if (!entry.status || (entry.status === magicSequence && !entry.isContentFetched) || subfolders.length) {
+ if (!item.status || (item.status === magicSequence && !item.isContentFetched) || subfolders.length) {
$indicator.removeClass('none');
- if (!entry.status || (entry.status === magicSequence && !entry.isContentFetched)) {
+ if (!item.status || (item.status === magicSequence && !item.isContentFetched)) {
$indicator.addClass('unknown');
- } else if (entry.isContentVisible) {
+ } else if (item.isContentVisible) {
$indicator.addClass('open');
} else {
$indicator.addClass('close');
@@ -56,19 +56,19 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
}
// is it the domain?
- if (entry.isDomain()) {
+ if (item.isDomain()) {
$html.addClass('domain');
$img.attr('src', resource.icon('folder-home'));
}
// is it the root?
- if (entry.isRoot()) {
+ if (item.isRoot()) {
$html.addClass('root');
$img.attr('src', resource.icon('folder-home'));
}
// is it the current folder?
- if (entry.isCurrentFolder()) {
+ if (item.isCurrentFolder()) {
$html.addClass('current');
$img.attr('src', resource.icon('folder-open'));
}
@@ -86,27 +86,27 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
if (subfolders.length > settings.maxSubfolders) {
$('… ' + (subfolders.length - settings.maxSubfolders) + ' more subfolders ').appendTo($ul);
}
- if (!entry.isContentVisible) {
+ if (!item.isContentVisible) {
$ul.hide();
}
}
// reflect folder status
- if (_.isNumber(entry.status)) {
- if (entry.status === 200) {
+ if (_.isNumber(item.status)) {
+ if (item.status === 200) {
$img.attr('src', resource.icon('folder-page'));
} else {
$html.addClass('error');
- $a.append($(statusHintTemplate).text(entry.status));
+ $a.append($(statusHintTemplate).text(item.status));
}
}
}
- if (entry.$tree) {
- entry.$tree.replaceWith($html);
+ if (item.$tree) {
+ item.$tree.replaceWith($html);
}
- entry.$tree = $html;
+ item.$tree = $html;
return $html;
},
@@ -114,9 +114,9 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
createOnIndicatorClick = function () {
var $tree = $('#tree'),
- slide = function (entry, $indicator, $content, down) {
+ slide = function (item, $indicator, $content, down) {
- entry.isContentVisible = down;
+ item.isContentVisible = down;
$indicator.removeClass('open close').addClass(down ? 'open' : 'close');
$tree.scrollpanel('update', true);
$content[down ? 'slideDown' : 'slideUp'](function () {
@@ -128,32 +128,32 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
return function () {
var $indicator = $(this),
- $entry = $indicator.closest('.entry'),
- entry = $entry.data('entry'),
- $content = $entry.find('> ul.content');
+ $item = $indicator.closest('.item'),
+ item = $item.data('item'),
+ $content = $item.find('> ul.content');
if ($indicator.hasClass('unknown')) {
- entry.fetchContent(function (entry) {
+ item.fetchContent(function (item) {
- entry.isContentVisible = false;
+ item.isContentVisible = false;
- var $entry = update(entry),
- $indicator = $entry.find('> .indicator'),
- $content = $entry.find('> ul.content');
+ var $item = update(item),
+ $indicator = $item.find('> .indicator'),
+ $content = $item.find('> ul.content');
if (!$indicator.hasClass('none')) {
- slide(entry, $indicator, $content, true);
+ slide(item, $indicator, $content, true);
}
});
} else if ($indicator.hasClass('open')) {
- slide(entry, $indicator, $content, false);
+ slide(item, $indicator, $content, false);
} else if ($indicator.hasClass('close')) {
- slide(entry, $indicator, $content, true);
+ slide(item, $indicator, $content, true);
}
};
},
@@ -171,15 +171,15 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
}
},
- fetchTree = function (entry, callback) {
+ fetchTree = function (item, callback) {
- entry.isContentVisible = true;
- entry.fetchContent(function (entry) {
+ item.isContentVisible = true;
+ item.fetchContent(function (item) {
- if (entry.parent) {
- fetchTree(entry.parent, callback);
+ if (item.parent) {
+ fetchTree(item.parent, callback);
} else {
- callback(entry);
+ callback(item);
}
});
},
@@ -199,13 +199,13 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
$tree.scrollpanel('update');
},
- onContentChanged = function (entry) {
+ onContentChanged = function (item) {
- while (entry.parent) {
- entry = entry.parent;
+ while (item.parent) {
+ item = item.parent;
}
- update(entry);
+ update(item);
adjustSpacing();
shiftTree(false, true);
},
diff --git a/src/_h5ai/client/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/item.js
similarity index 73%
rename from src/_h5ai/client/js/inc/model/entry.js
rename to src/_h5ai/client/js/inc/model/item.js
index fbb6248e..b8be6e84 100644
--- a/src/_h5ai/client/js/inc/model/entry.js
+++ b/src/_h5ai/client/js/inc/model/item.js
@@ -1,5 +1,5 @@
-modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function (_, types, event, settings, server, location) {
+modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings', 'core/server', 'core/location'], function (_, types, event, settings, server, location) {
var reEndsWithSlash = /\/$/,
@@ -39,11 +39,9 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
- // Cache
-
cache = {},
- getEntry = function (absHref, time, size, status, isContentFetched) {
+ getItem = function (absHref, time, size, status, isContentFetched) {
absHref = location.forceEncoding(absHref);
@@ -51,7 +49,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
return null;
}
- var self = cache[absHref] || new Entry(absHref);
+ var self = cache[absHref] || new Item(absHref);
if (_.isNumber(time)) {
self.time = time;
@@ -69,7 +67,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
return self;
},
- removeEntry = function (absHref) {
+ removeItem = function (absHref) {
absHref = location.forceEncoding(absHref);
@@ -80,16 +78,16 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
if (self.parent) {
delete self.parent.content[self.absHref];
}
- _.each(self.content, function (entry) {
+ _.each(self.content, function (item) {
- removeEntry(entry.absHref);
+ removeItem(item.absHref);
});
}
},
fetchContent = function (absHref, callback) {
- var self = getEntry(absHref);
+ var self = getItem(absHref);
if (!_.isFunction(callback)) {
callback = function () {};
@@ -101,8 +99,8 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
server.request({action: 'get', entries: true, entriesHref: self.absHref, entriesWhat: 1}, function (response) {
if (response.entries) {
- _.each(response.entries, function (entry) {
- getEntry(entry.absHref, entry.time, entry.size, entry.status, entry.content);
+ _.each(response.entries, function (item) {
+ getItem(item.absHref, item.time, item.size, item.status, item.content);
});
}
@@ -113,9 +111,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
- // Entry
-
- var Entry = function (absHref) {
+ var Item = function (absHref) {
var split = splitPath(absHref);
@@ -131,7 +127,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
this.content = {};
if (split.parent) {
- this.parent = getEntry(split.parent);
+ this.parent = getItem(split.parent);
this.parent.content[this.absHref] = this;
if (_.keys(this.parent.content).length > 1) {
this.parent.isContentFetched = true;
@@ -139,7 +135,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
}
};
- _.extend(Entry.prototype, {
+ _.extend(Item.prototype, {
isFolder: function () {
@@ -158,7 +154,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
isCurrentParentFolder: function () {
- return this === getEntry(location.getAbsHref()).parent;
+ return this === getItem(location.getAbsHref()).parent;
},
isDomain: function () {
@@ -188,12 +184,12 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
getCrumb: function () {
- var entry = this,
- crumb = [entry];
+ var item = this,
+ crumb = [item];
- while (entry.parent) {
- entry = entry.parent;
- crumb.unshift(entry);
+ while (item.parent) {
+ item = item.parent;
+ crumb.unshift(item);
}
return crumb;
@@ -201,12 +197,12 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
getSubfolders: function () {
- return _.sortBy(_.filter(this.content, function (entry) {
+ return _.sortBy(_.filter(this.content, function (item) {
- return entry.isFolder();
- }), function (entry) {
+ return item.isFolder();
+ }), function (item) {
- return entry.label.toLowerCase();
+ return item.label.toLowerCase();
});
},
@@ -215,9 +211,9 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
var folders = 0,
files = 0;
- _.each(this.content, function (entry) {
+ _.each(this.content, function (item) {
- if (entry.isFolder()) {
+ if (item.isFolder()) {
folders += 1;
} else {
files += 1;
@@ -225,11 +221,11 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
});
var depth = 0,
- entry = this;
+ item = this;
- while (entry.parent) {
+ while (item.parent) {
depth += 1;
- entry = entry.parent;
+ item = item.parent;
}
return {
@@ -241,7 +237,7 @@ modulejs.define('model/entry', ['_', 'core/types', 'core/event', 'core/settings'
});
return {
- get: getEntry,
- remove: removeEntry
+ get: getItem,
+ remove: removeItem
};
});
diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js
index 5070538e..5e3a99de 100644
--- a/src/_h5ai/client/js/inc/view/items.js
+++ b/src/_h5ai/client/js/inc/view/items.js
@@ -6,7 +6,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
binaryPrefix: false
}, allsettings.view),
- template = '' +
+ itemTemplate = ' ' +
'' +
'![]()
' +
'![]()
' +
@@ -16,7 +16,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
'' +
' ',
hintTemplate = '',
- listTemplate = '
- ' +
+ itemsTemplate = '
- ' +
'' +
'' +
@@ -27,14 +27,14 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
emptyTemplate = '',
contentTemplate = '', - // updates this single entry - update = function (entry, force) { + // updates this single item + update = function (item, force) { - if (!force && entry.$extended && entry.status && entry.$extended.data('status') === entry.status) { - return entry.$extended; + if (!force && item.$extended) { + return item.$extended; } - var $html = $(template), + var $html = $(itemTemplate), $a = $html.find('a'), $imgSmall = $html.find('.icon.small img'), $imgBig = $html.find('.icon.big img'), @@ -43,30 +43,29 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $size = $html.find('.size'); $html - .addClass(entry.isFolder() ? 'folder' : 'file') - .data('entry', entry) - .data('status', entry.status); + .addClass(item.isFolder() ? 'folder' : 'file') + .data('item', item); - location.setLink($a, entry); + location.setLink($a, item); - $imgSmall.attr('src', resource.icon(entry.type)).attr('alt', entry.type); - $imgBig.attr('src', resource.icon(entry.type, true)).attr('alt', entry.type); - $label.text(entry.label); - $date.data('time', entry.time).text(format.formatDate(entry.time)); - $size.data('bytes', entry.size).text(format.formatSize(entry.size)); + $imgSmall.attr('src', resource.icon(item.type)).attr('alt', item.type); + $imgBig.attr('src', resource.icon(item.type, true)).attr('alt', item.type); + $label.text(item.label); + $date.data('time', item.time).text(format.formatDate(item.time)); + $size.data('bytes', item.size).text(format.formatSize(item.size)); - if (entry.isFolder() && _.isNumber(entry.status)) { - if (entry.status === 200) { + if (item.isFolder() && _.isNumber(item.status)) { + if (item.status === 200) { $html.addClass('page'); $imgSmall.attr('src', resource.icon('folder-page')); $imgBig.attr('src', resource.icon('folder-page', true)); } else { $html.addClass('error'); - $label.append($(hintTemplate).text(' ' + entry.status + ' ')); + $label.append($(hintTemplate).text(' ' + item.status + ' ')); } } - if (entry.isCurrentParentFolder()) { + if (item.isCurrentParentFolder()) { $imgSmall.attr('src', resource.icon('folder-parent')); $imgBig.attr('src', resource.icon('folder-parent', true)); if (!settings.setParentFolderLabels) { @@ -75,41 +74,41 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $html.addClass('folder-parent'); } - if (entry.$extended) { - entry.$extended.replaceWith($html); + if (item.$extended) { + item.$extended.replaceWith($html); } - entry.$extended = $html; + item.$extended = $html; return $html; }, onMouseenter = function () { - var entry = $(this).closest('.entry').data('entry'); - event.pub('entry.mouseenter', entry); + var item = $(this).closest('.item').data('item'); + event.pub('item.mouseenter', item); }, onMouseleave = function () { - var entry = $(this).closest('.entry').data('entry'); - event.pub('entry.mouseleave', entry); + var item = $(this).closest('.item').data('item'); + event.pub('item.mouseleave', item); }, onLocationChanged = function (item) { var $extended = $('#extended'), - $ul = $extended.find('ul'), + $items = $('#items'), $empty = $extended.find('.empty'); - $ul.find('.entry').remove(); + $items.find('.item').remove(); if (item.parent) { - $ul.append(update(item.parent)); + $items.append(update(item.parent, true)); } _.each(item.content, function (e) { - $ul.append(update(e)); + $items.append(update(e, true)); }); if (item.isEmpty()) { @@ -122,12 +121,12 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core onLocationRefreshed = function (item, added, removed) { var $extended = $('#extended'), - $ul = $extended.find('ul'), + $items = $('#items'), $empty = $extended.find('.empty'); _.each(added, function (item) { - update(item, true).hide().appendTo($ul).fadeIn(400); + update(item, true).hide().appendTo($items).fadeIn(400); }); _.each(removed, function (item) { @@ -148,16 +147,18 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core var $content = $(contentTemplate), $extended = $content.find('#extended'), - $ul = $(listTemplate), + $items = $(itemsTemplate), $emtpy = $(emptyTemplate).hide(); format.setDefaultMetric(settings.binaryPrefix); $extended - .append($ul) - .append($emtpy) - .on('mouseenter', '.entry a', onMouseenter) - .on('mouseleave', '.entry a', onMouseleave); + .append($items) + .append($emtpy); + + $items + .on('mouseenter', '.item a', onMouseenter) + .on('mouseleave', '.item a', onMouseleave); event.sub('location.changed', onLocationChanged); event.sub('location.refreshed', onLocationRefreshed); diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js index 559b773c..f1eeebad 100644 --- a/src/_h5ai/client/js/inc/view/viewmode.js +++ b/src/_h5ai/client/js/inc/view/viewmode.js @@ -20,7 +20,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c var contentWidth = $('#content').width(), $extended = $('#extended'), - itemWidth = ($extended.hasClass('view-icons') || $extended.hasClass('view-grid')) ? ($extended.find('.entry').eq(0).width() || 1) : 1; + itemWidth = ($extended.hasClass('view-icons') || $extended.hasClass('view-grid')) ? ($extended.find('.item').eq(0).width() || 1) : 1; $extended.width(Math.floor(contentWidth / itemWidth) * itemWidth); }, diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index bbf9498f..3dcea873 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -55,7 +55,7 @@ Options - interval: number, update interval in milliseconds, at least 1000 */ "autorefresh": { - "enabled": true, + "enabled": false, "interval": 5000 },
- ' +
'