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

@ -6,7 +6,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
binaryPrefix: false
}, allsettings.view),
template = '<li class="entry">' +
itemTemplate = '<li class="item">' +
'<a>' +
'<span class="icon small"><img/></span>' +
'<span class="icon big"><img/></span>' +
@ -16,7 +16,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
'</a>' +
'</li>',
hintTemplate = '<span class="hint"/>',
listTemplate = '<ul>' +
itemsTemplate = '<ul id="items">' +
'<li class="header">' +
'<a class="icon"/>' +
'<a class="label" href="#"><span class="l10n-name"/></a>' +
@ -27,14 +27,14 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
emptyTemplate = '<div class="empty l10n-empty"/>',
contentTemplate = '<div id="content"><div id="extended" class="clearfix"/></div>',
// 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);