mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-06-03 08:38:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor item.

Browse source
This commit is contained in:
Lars Jung 2015-05-03 23:52:49 +02:00
parent 003b3f3edb
commit 0f1ca4e85b
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/_h5ai/client/js/inc/core/location.js
View file

@ -95,7 +95,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/event', 'core/settings
_.each(json.items, function (jsonItem) { _.each(json.items, function (jsonItem) {
var e = Item.get(jsonItem.href, jsonItem.time, jsonItem.size, jsonItem.isManaged, jsonItem.content); var e = Item.get(jsonItem);
found[e.absHref] = true; found[e.absHref] = true;
}); });

31
src/_h5ai/client/js/inc/model/item.js
View file

@ -46,26 +46,32 @@ modulejs.define('model/item', ['_', 'core/event', 'core/location', 'core/server'
} }
} }
function getItem(absHref, time, size, isManaged, isContentFetched) { function getItem(options) {
absHref = location.forceEncoding(absHref); if (_.isString(options)) {
options = {href: options};
if (!startsWith(absHref, settings.rootHref)) { } else if (!options || !_.isString(options.href)) {
return null; return null;
} }
var self = cache[absHref] || new Item(absHref); var href = location.forceEncoding(options.href);
if (_.isNumber(time)) { if (!startsWith(href, settings.rootHref)) {
self.time = time; return null;
} }
if (_.isNumber(size)) {
self.size = size; var self = cache[href] || new Item(href);
if (_.isNumber(options.time)) {
self.time = options.time;
} }
if (isManaged) { if (_.isNumber(options.size)) {
self.size = options.size;
}
if (options.managed) {
self.isManaged = true; self.isManaged = true;
} }
if (isContentFetched) { if (options.fetched) {
self.isContentFetched = true; self.isContentFetched = true;
} }
@ -105,7 +111,8 @@ modulejs.define('model/item', ['_', 'core/event', 'core/location', 'core/server'
if (response.items) { if (response.items) {
_.each(response.items, function (jsonItem) { _.each(response.items, function (jsonItem) {
getItem(jsonItem.href, jsonItem.time, jsonItem.size, jsonItem.isManaged, jsonItem.content);
getItem(jsonItem);
}); });
} }

4
src/_h5ai/server/php/inc/class-item.php
View file

@ -61,8 +61,8 @@ class Item {
); );
if ($this->is_folder) { if ($this->is_folder) {
$obj["isManaged"] = $this->app->is_managed_href($this->href); $obj["managed"] = $this->app->is_managed_href($this->href);
$obj["content"] = $this->is_content_fetched; $obj["fetched"] = $this->is_content_fetched;
} }
return $obj; return $obj;