Refactors.

This commit is contained in:
Lars Jung 2013-08-27 22:38:44 +02:00
parent 7b3daeb17b
commit 4d4e41a637
5 changed files with 11 additions and 17 deletions

View file

@ -1,12 +1,12 @@
modulejs.define('core/resource', ['core/settings'], function (settings) { modulejs.define('core/resource', ['core/settings'], function (settings) {
var image = function (id, customExt) { var image = function (id) {
return settings.h5aiAbsHref + 'client/images/' + id + (customExt ? '' : '.svg'); return settings.h5aiAbsHref + 'client/images/' + id + '.svg';
}, },
icon = function (id, big) { icon = function (id) {
return settings.h5aiAbsHref + 'client/icons/96/' + id + '.png'; return settings.h5aiAbsHref + 'client/icons/96/' + id + '.png';
}; };

View file

@ -37,7 +37,7 @@ modulejs.define('ext/delete', ['_', '$', 'core/settings', 'core/event', 'core/re
requestDeletion = function (hrefsStr) { requestDeletion = function (hrefsStr) {
$delete.addClass('current'); $delete.addClass('current');
$img.attr('src', resource.image('loading.gif', true)); $img.attr('src', resource.image('loading'));
server.request({action: 'delete', hrefs: hrefsStr}, handleResponse); server.request({action: 'delete', hrefs: hrefsStr}, handleResponse);
}, },

View file

@ -29,11 +29,11 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
var type = null; var type = null;
if (_.indexOf(settings.img, item.type) >= 0) { if (_.contains(settings.img, item.type)) {
type = 'img'; type = 'img';
} else if (_.indexOf(settings.mov, item.type) >= 0) { } else if (_.contains(settings.mov, item.type)) {
type = 'mov'; type = 'mov';
} else if (_.indexOf(settings.doc, item.type) >= 0) { } else if (_.contains(settings.doc, item.type)) {
type = 'doc'; type = 'doc';
} }

View file

@ -34,7 +34,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
.data('status', item.status); .data('status', item.status);
location.setLink($a, item); location.setLink($a, item);
// $img.attr('src', resource.icon(item.type));
$img.attr('src', resource.image('folder')); $img.attr('src', resource.image('folder'));
$label.text(item.label); $label.text(item.label);
@ -95,7 +94,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
// reflect folder status // reflect folder status
if (_.isNumber(item.status)) { if (_.isNumber(item.status)) {
if (item.status === 200) { if (item.status === 200) {
// $img.attr('src', resource.icon('folder-page'));
$img.attr('src', resource.image('folder-page')); $img.attr('src', resource.image('folder-page'));
} else { } else {
$html.addClass('error'); $html.addClass('error');

View file

@ -39,8 +39,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
var $html = $(itemTemplate), var $html = $(itemTemplate),
$a = $html.find('a'), $a = $html.find('a'),
$imgSquare = $html.find('.icon.square img'), $iconImg = $html.find('.icon img'),
$imgRational = $html.find('.icon.rational img'),
$label = $html.find('.label'), $label = $html.find('.label'),
$date = $html.find('.date'), $date = $html.find('.date'),
$size = $html.find('.size'); $size = $html.find('.size');
@ -51,8 +50,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
location.setLink($a, item); location.setLink($a, item);
$imgSquare.attr('src', resource.icon(item.type)).attr('alt', item.type); $iconImg.attr('src', resource.icon(item.type)).attr('alt', item.type);
$imgRational.attr('src', resource.icon(item.type)).attr('alt', item.type);
$label.text(item.label); $label.text(item.label);
$date.data('time', item.time).text(format.formatDate(item.time)); $date.data('time', item.time).text(format.formatDate(item.time));
$size.data('bytes', item.size).text(format.formatSize(item.size)); $size.data('bytes', item.size).text(format.formatSize(item.size));
@ -60,8 +58,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
if (item.isFolder() && _.isNumber(item.status)) { if (item.isFolder() && _.isNumber(item.status)) {
if (item.status === 200) { if (item.status === 200) {
$html.addClass('page'); $html.addClass('page');
$imgSquare.attr('src', resource.icon('folder-page')); $iconImg.attr('src', resource.icon('folder-page'));
$imgRational.attr('src', resource.icon('folder-page'));
} else { } else {
$html.addClass('error'); $html.addClass('error');
$label.append($(hintTemplate).text(' ' + item.status + ' ')); $label.append($(hintTemplate).text(' ' + item.status + ' '));
@ -69,8 +66,7 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
} }
if (item.isCurrentParentFolder()) { if (item.isCurrentParentFolder()) {
$imgSquare.attr('src', resource.icon('folder-parent')); $iconImg.attr('src', resource.icon('folder-parent'));
$imgRational.attr('src', resource.icon('folder-parent'));
if (!settings.setParentFolderLabels) { if (!settings.setParentFolderLabels) {
$label.addClass('l10n-parentDirectory'); $label.addClass('l10n-parentDirectory');
} }