diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index d77da7c39..6edfa1299 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -788,6 +788,7 @@ define([ getAllStores().forEach(function (s) { s.manager.getPadAttribute(data, waitFor(function (err, val) { if (err) { return; } + if (!val || typeof(val) !== "object") { return void console.error("Not an object!"); } if (!res.value || res.atime < val.atime) { res.atime = val.atime; res.value = val.value; diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index 1c813304a..ca914b57a 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -741,8 +741,12 @@ define([ cb = cb || function () {}; var sfId = Env.user.userObject.getSFIdFromHref(data.href); if (sfId) { + var sfData = Env.user.proxy[UserObject.SHARED_FOLDERS][sfId]; setTimeout(function () { - cb(null, Env.user.proxy[UserObject.SHARED_FOLDERS][sfId][data.attr]); + cb(null, { + value: sfData[data.attr], + atime: 1 + }); }); return; }