Semantic changes.

This commit is contained in:
Lars Jung 2012-10-27 03:50:35 +02:00
parent 9163996ac2
commit 1dea89befb
24 changed files with 243 additions and 237 deletions

View file

@ -14,49 +14,48 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/
pageHintTemplate = '<img class="hint" src="' + resource.image('page') + '" alt="has index page"/>',
statusHintTemplate = '<span class="hint"/>',
update = function (entry, force) {
update = function (item, force) {
if (!force && entry.$crumb && entry.$crumb.data('status') === entry.status) {
return entry.$crumb;
if (!force && item.$crumb) {
return item.$crumb;
}
var $html = $(template),
$a = $html.find('a');
$html
.addClass(entry.isFolder() ? 'folder' : 'file')
.data('item', entry)
.data('status', entry.status);
.addClass(item.isFolder() ? 'folder' : 'file')
.data('item', item);
location.setLink($a, entry);
$a.find('span').text(entry.label).end();
location.setLink($a, item);
$a.find('span').text(item.label).end();
if (entry.isDomain()) {
if (item.isDomain()) {
$html.addClass('domain');
$a.find('img').attr('src', resource.image('home'));
}
if (entry.isRoot()) {
if (item.isRoot()) {
$html.addClass('root');
$a.find('img').attr('src', resource.image('home'));
}
if (entry.isCurrentFolder()) {
if (item.isCurrentFolder()) {
$html.addClass('current');
}
if (_.isNumber(entry.status)) {
if (entry.status === 200) {
if (_.isNumber(item.status)) {
if (item.status === 200) {
$a.append($(pageHintTemplate));
} else {
$a.append($(statusHintTemplate).text('(' + entry.status + ')'));
$a.append($(statusHintTemplate).text('(' + item.status + ')'));
}
}
if (entry.$crumb) {
entry.$crumb.replaceWith($html);
if (item.$crumb) {
item.$crumb.replaceWith($html);
}
entry.$crumb = $html;
item.$crumb = $html;
return $html;
},

View file

@ -45,9 +45,9 @@ modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/re
selectedHrefsStr = '';
if (entries.length) {
selectedHrefsStr = _.map(entries, function (entry) {
selectedHrefsStr = _.map(entries, function (item) {
return entry.absHref;
return item.absHref;
}).join(':');
$delete.appendTo('#navbar').show();
} else {

View file

@ -60,9 +60,9 @@ modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'co
selectedHrefsStr = '';
if (entries.length) {
selectedHrefsStr = _.map(entries, function (entry) {
selectedHrefsStr = _.map(entries, function (item) {
return entry.absHref;
return item.absHref;
}).join(':');
$download.appendTo('#navbar').show();
} else {

View file

@ -22,7 +22,7 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func
duration = 200;
if (re) {
$('#extended .entry').each(function () {
$('#items .item').each(function () {
var label = $(this).find('.label').text();
@ -33,7 +33,7 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func
}
});
} else {
match = $('#extended .entry');
match = $('#items .item');
}
if ($(match).length) {

View file

@ -55,7 +55,7 @@ modulejs.define('ext/l10n', ['_', '$', 'core/settings', 'core/langs', 'core/form
format.setDefaultDateFormat(currentLang.dateFormat);
$('#extended .entry .date').each(function () {
$('#items .item .date').each(function () {
var $this = $(this);

View file

@ -201,32 +201,32 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource',
event.stopImmediatePropagation();
},
initEntry = function (entry) {
initItem = function (item) {
if (entry.$extended && _.indexOf(settings.types, entry.type) >= 0) {
entry.$extended.find('a').on('click', function (event) {
if (item.$extended && _.indexOf(settings.types, item.type) >= 0) {
item.$extended.find('a').on('click', function (event) {
event.preventDefault();
var matchedEntries = _.compact(_.map($('#extended .entry'), function (entry) {
var matchedEntries = _.compact(_.map($('#items .item'), function (item) {
entry = $(entry).data('entry');
return _.indexOf(settings.types, entry.type) >= 0 ? entry : null;
item = $(item).data('item');
return _.indexOf(settings.types, item.type) >= 0 ? item : null;
}));
onEnter(matchedEntries, _.indexOf(matchedEntries, entry));
onEnter(matchedEntries, _.indexOf(matchedEntries, item));
});
}
},
onLocationChanged = function (item) {
_.each(item.content, initEntry);
_.each(item.content, initItem);
},
onLocationRefreshed = function (item, added, removed) {
_.each(added, initEntry);
_.each(added, initItem);
},
init = function () {

View file

@ -252,32 +252,32 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
event.stopImmediatePropagation();
},
initEntry = function (entry) {
initItem = function (item) {
if (entry.$extended && _.indexOf(_.keys(settings.types), entry.type) >= 0) {
entry.$extended.find('a').on('click', function (event) {
if (item.$extended && _.indexOf(_.keys(settings.types), item.type) >= 0) {
item.$extended.find('a').on('click', function (event) {
event.preventDefault();
var matchedEntries = _.compact(_.map($('#extended .entry'), function (entry) {
var matchedEntries = _.compact(_.map($('#item .item'), function (item) {
entry = $(entry).data('entry');
return _.indexOf(_.keys(settings.types), entry.type) >= 0 ? entry : null;
item = $(item).data('item');
return _.indexOf(_.keys(settings.types), item.type) >= 0 ? item : null;
}));
onEnter(matchedEntries, _.indexOf(matchedEntries, entry));
onEnter(matchedEntries, _.indexOf(matchedEntries, item));
});
}
},
onLocationChanged = function (item) {
_.each(item.content, initEntry);
_.each(item.content, initItem);
},
onLocationRefreshed = function (item, added, removed) {
_.each(added, initEntry);
_.each(added, initItem);
},
init = function () {

View file

@ -26,7 +26,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve
}
},
update = function (entry) {
update = function (item) {
loadQrCodeExtension(function () {
$qrcode.empty().qrcode({
@ -34,21 +34,21 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve
width: settings.size,
height: settings.size,
color: '#333',
text: 'http://' + document.domain + entry.absHref
text: 'http://' + document.domain + item.absHref
});
});
},
onMouseenter = function (entry) {
onMouseenter = function (item) {
if (!entry.isFolder()) {
update(entry);
if (!item.isFolder()) {
update(item);
clearTimeout(hideTimeoutId);
$qrcode.stop(true, true).fadeIn(400);
}
},
onMouseleave = function (entry) {
onMouseleave = function (item) {
hideTimeoutId = setTimeout(function () {
@ -64,8 +64,8 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve
$qrcode = $(template).appendTo('body');
event.sub('entry.mouseenter', onMouseenter);
event.sub('entry.mouseleave', onMouseleave);
event.sub('item.mouseenter', onMouseenter);
event.sub('item.mouseleave', onMouseleave);
};
init();

View file

@ -13,9 +13,9 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
publish = function () {
var entries = _.map($('#extended .entry.selected'), function (entryElement) {
var entries = _.map($('#items .item.selected'), function (itemElement) {
return $(entryElement).data('entry');
return $(itemElement).data('item');
});
event.pub('selection', entries);
@ -35,13 +35,13 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
.show();
var selRect = $selectionRect.fracs('rect');
$('#extended .entry').removeClass('selecting').each(function () {
$('#items .item').removeClass('selecting').each(function () {
var $entry = $(this),
rect = $entry.find('a').fracs('rect'),
var $item = $(this),
rect = $item.find('a').fracs('rect'),
inter = selRect.intersection(rect);
if (inter && !$entry.hasClass('folder-parent')) {
$entry.addClass('selecting');
if (inter && !$item.hasClass('folder-parent')) {
$item.addClass('selecting');
}
});
},
@ -50,8 +50,8 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
event.preventDefault();
$document.off('mousemove', selectionUpdate);
$('#extended .entry.selecting.selected').removeClass('selecting').removeClass('selected');
$('#extended .entry.selecting').removeClass('selecting').addClass('selected');
$('#items .item.selecting.selected').removeClass('selecting').removeClass('selected');
$('#items .item.selecting').removeClass('selecting').addClass('selected');
publish();
$selectionRect
@ -87,7 +87,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
$(':focus').blur();
if (!event.ctrlKey && !event.metaKey) {
$('#extended .entry').removeClass('selected');
$('#items .item').removeClass('selected');
publish();
}

View file

@ -8,13 +8,13 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
storekey = 'sort.order',
type = function (entry) {
type = function (item) {
var $entry = $(entry);
var $item = $(item);
if ($entry.hasClass('folder-parent')) {
if ($item.hasClass('folder-parent')) {
return 0;
} else if ($entry.hasClass('folder')) {
} else if ($item.hasClass('folder')) {
return 1;
}
return 2;
@ -22,17 +22,17 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
cmpFn = function (rev, getVal) {
return function (entry1, entry2) {
return function (item1, item2) {
var res, val1, val2;
res = type(entry1) - type(entry2);
res = type(item1) - type(item2);
if (res !== 0) {
return res;
}
val1 = getVal(entry1);
val2 = getVal(entry2);
val1 = getVal(item1);
val2 = getVal(item2);
if (val1 < val2) {
return rev ? 1 : -1;
} else if (val1 > val2) {
@ -42,17 +42,17 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
};
},
getName = function (entry) {
getName = function (item) {
return $(entry).find('.label').text().toLowerCase();
return $(item).find('.label').text().toLowerCase();
},
getTime = function (entry) {
getTime = function (item) {
return $(entry).find('.date').data('time');
return $(item).find('.date').data('time');
},
getSize = function (entry) {
getSize = function (item) {
return $(entry).find('.size').data('bytes');
return $(item).find('.size').data('bytes');
},
$all, orders,
@ -65,10 +65,10 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
$all.removeClass('ascending').removeClass('descending');
order.head.addClass(order.clas);
$('#extended .entry').detach().sort(order.fn).appendTo('#extended > ul');
$('#items .item').detach().sort(order.fn).appendTo('#items');
},
onContentChanged = function (entry) {
onContentChanged = function (item) {
sortBy(store.get(storekey) || settings.order);
},
@ -81,7 +81,7 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
var $ascending = $('<img src="' + resource.image('ascending') + '" class="sort ascending" alt="ascending" />'),
$descending = $('<img src="' + resource.image('descending') + '" class="sort descending" alt="descending" />'),
$header = $('#extended li.header'),
$header = $('#items li.header'),
$label = $header.find('a.label'),
$date = $header.find('a.date'),
$size = $header.find('a.size');

View file

@ -54,25 +54,25 @@ modulejs.define('ext/statusbar', ['_', '$', 'core/settings', 'core/format', 'cor
event.sub('location.changed', onLocationChanged);
event.sub('location.refreshed', onLocationChanged);
event.sub('entry.mouseenter', function (entry) {
event.sub('item.mouseenter', function (item) {
if (entry.isCurrentParentFolder()) {
if (item.isCurrentParentFolder()) {
return;
}
var $span = $('<span/>').append(entry.label);
var $span = $('<span/>').append(item.label);
if (_.isNumber(entry.time)) {
$span.append(sepTemplate).append(format.formatDate(entry.time));
if (_.isNumber(item.time)) {
$span.append(sepTemplate).append(format.formatDate(item.time));
}
if (_.isNumber(entry.size)) {
$span.append(sepTemplate).append(format.formatSize(entry.size));
if (_.isNumber(item.size)) {
$span.append(sepTemplate).append(format.formatSize(item.size));
}
update($span);
});
event.sub('entry.mouseleave', function (entry) {
event.sub('item.mouseleave', function (item) {
update();
});

View file

@ -25,31 +25,41 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
});
},
checkEntry = function (entry) {
checkItem = function (item) {
var type = null;
if (_.indexOf(settings.img, entry.type) >= 0) {
if (_.indexOf(settings.img, item.type) >= 0) {
type = 'img';
} else if (_.indexOf(settings.mov, entry.type) >= 0) {
} else if (_.indexOf(settings.mov, item.type) >= 0) {
type = 'mov';
} else if (_.indexOf(settings.doc, entry.type) >= 0) {
} else if (_.indexOf(settings.doc, item.type) >= 0) {
type = 'doc';
}
if (type) {
requestThumbSmall(type, entry.absHref, function (src) {
if (item.thumbSmall) {
item.$extended.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall);
} else {
requestThumbSmall(type, item.absHref, function (src) {
if (src && entry.$extended) {
entry.$extended.find('.icon.small img').addClass('thumb').attr('src', src);
}
});
requestThumbBig(type, entry.absHref, function (src) {
if (src && item.$extended) {
item.thumbSmall = src;
item.$extended.find('.icon.small img').addClass('thumb').attr('src', src);
}
});
}
if (item.thumbBig) {
item.$extended.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig);
} else {
requestThumbBig(type, item.absHref, function (src) {
if (src && entry.$extended) {
entry.$extended.find('.icon.big img').addClass('thumb').attr('src', src);
}
});
if (src && item.$extended) {
item.thumbBig = src;
item.$extended.find('.icon.big img').addClass('thumb').attr('src', src);
}
});
}
}
},
@ -57,13 +67,13 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
setTimeout(function () {
_.each(item.content, checkEntry);
_.each(item.content, checkItem);
}, settings.delay);
},
onLocationRefreshed = function (item, added, removed) {
_.each(added, checkEntry);
_.each(added, checkItem);
},
init = function () {

View file

@ -7,7 +7,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
maxSubfolders: 50
}, allsettings.tree),
template = '<div class="entry">' +
template = '<div class="item">' +
'<span class="indicator none">' +
'<img src="' + resource.image('tree') + '"/>' +
'</span>' +
@ -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) {
$('<li class="summary">… ' + (subfolders.length - settings.maxSubfolders) + ' more subfolders</li>').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);
},