mirror of
https://github.com/lrsjng/h5ai.git
synced 2025-05-31 07:18:21 -04:00
Small fixes and semantics.
This commit is contained in:
parent
3a92606e0c
commit
84be82d175
18 changed files with 81 additions and 83 deletions
|
@ -88,7 +88,7 @@ modulejs.define('ext/filter', ['_', '$', 'core/settings', 'core/resource'], func
|
|||
|
||||
$filter = $(template).appendTo('#navbar');
|
||||
$input = $filter.find('input');
|
||||
$noMatch = $(noMatchTemplate).appendTo('#extended');
|
||||
$noMatch = $(noMatchTemplate).appendTo('#view');
|
||||
|
||||
$filter
|
||||
.on('click', function () {
|
||||
|
|
|
@ -203,8 +203,8 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource',
|
|||
|
||||
initItem = function (item) {
|
||||
|
||||
if (item.$extended && _.indexOf(settings.types, item.type) >= 0) {
|
||||
item.$extended.find('a').on('click', function (event) {
|
||||
if (item.$view && _.indexOf(settings.types, item.type) >= 0) {
|
||||
item.$view.find('a').on('click', function (event) {
|
||||
|
||||
event.preventDefault();
|
||||
|
||||
|
|
|
@ -254,8 +254,8 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource',
|
|||
|
||||
initItem = function (item) {
|
||||
|
||||
if (item.$extended && _.indexOf(_.keys(settings.types), item.type) >= 0) {
|
||||
item.$extended.find('a').on('click', function (event) {
|
||||
if (item.$view && _.indexOf(_.keys(settings.types), item.type) >= 0) {
|
||||
item.$view.find('a').on('click', function (event) {
|
||||
|
||||
event.preventDefault();
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
|
|||
.animate(
|
||||
{
|
||||
left: l + w * 0.5 * shrink,
|
||||
top: t + h * 0.5 * shrink,
|
||||
top: t + h * 0.5 * shrink,
|
||||
width: w * (1 - shrink),
|
||||
height: h * (1 - shrink),
|
||||
opacity: 0
|
||||
|
@ -111,14 +111,19 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
|
|||
}
|
||||
},
|
||||
|
||||
onLocationChanged = function () {
|
||||
|
||||
publish();
|
||||
},
|
||||
|
||||
onLocationRefreshed = function (item, added, removed) {
|
||||
|
||||
var selectionChanged = false;
|
||||
|
||||
_.each(removed, function (item) {
|
||||
|
||||
if (item.$extended && item.$extended.hasClass('selected')) {
|
||||
item.$extended.removeClass('selected');
|
||||
if (item.$view && item.$view.hasClass('selected')) {
|
||||
item.$view.removeClass('selected');
|
||||
selectionChanged = true;
|
||||
}
|
||||
});
|
||||
|
@ -136,6 +141,7 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio
|
|||
|
||||
$selectionRect.hide().appendTo('body');
|
||||
|
||||
event.sub('location.changed', onLocationChanged);
|
||||
event.sub('location.refreshed', onLocationRefreshed);
|
||||
|
||||
$document
|
||||
|
|
|
@ -39,24 +39,24 @@ modulejs.define('ext/thumbnails', ['_', 'core/settings', 'core/event', 'core/ser
|
|||
|
||||
if (type) {
|
||||
if (item.thumbSmall) {
|
||||
item.$extended.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall);
|
||||
item.$view.find('.icon.small img').addClass('thumb').attr('src', item.thumbSmall);
|
||||
} else {
|
||||
requestThumbSmall(type, item.absHref, function (src) {
|
||||
|
||||
if (src && item.$extended) {
|
||||
if (src && item.$view) {
|
||||
item.thumbSmall = src;
|
||||
item.$extended.find('.icon.small img').addClass('thumb').attr('src', src);
|
||||
item.$view.find('.icon.small img').addClass('thumb').attr('src', src);
|
||||
}
|
||||
});
|
||||
}
|
||||
if (item.thumbBig) {
|
||||
item.$extended.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig);
|
||||
item.$view.find('.icon.big img').addClass('thumb').attr('src', item.thumbBig);
|
||||
} else {
|
||||
requestThumbBig(type, item.absHref, function (src) {
|
||||
|
||||
if (src && item.$extended) {
|
||||
if (src && item.$view) {
|
||||
item.thumbBig = src;
|
||||
item.$extended.find('.icon.big img').addClass('thumb').attr('src', src);
|
||||
item.$view.find('.icon.big img').addClass('thumb').attr('src', src);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -161,8 +161,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
|
|||
shiftTree = function (forceVisible, dontAnimate) {
|
||||
|
||||
var $tree = $("#tree"),
|
||||
$extended = $("#extended"),
|
||||
left = ((settings.slide && $tree.outerWidth() < $extended.offset().left) || forceVisible || !$extended.is(':visible')) ? 0 : 18 - $tree.outerWidth();
|
||||
$view = $("#view"),
|
||||
left = ((settings.slide && $tree.outerWidth() < $view.offset().left) || forceVisible || !$view.is(':visible')) ? 0 : 18 - $tree.outerWidth();
|
||||
|
||||
if (dontAnimate) {
|
||||
$tree.stop().css({ left: left });
|
||||
|
@ -199,17 +199,6 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
|
|||
$tree.scrollpanel('update');
|
||||
},
|
||||
|
||||
onContentChanged = function (item) {
|
||||
|
||||
while (item.parent) {
|
||||
item = item.parent;
|
||||
}
|
||||
|
||||
update(item);
|
||||
adjustSpacing();
|
||||
shiftTree(false, true);
|
||||
},
|
||||
|
||||
onLocationChanged = function (item) {
|
||||
|
||||
fetchTree(item, function (root) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue