Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
commit
68ce7fe53d
2 changed files with 7 additions and 2 deletions
|
@ -772,6 +772,7 @@ define([
|
||||||
*/
|
*/
|
||||||
var LIMIT_REFRESH_RATE = 30000; // milliseconds
|
var LIMIT_REFRESH_RATE = 30000; // milliseconds
|
||||||
UIElements.createUsageBar = function (common, cb) {
|
UIElements.createUsageBar = function (common, cb) {
|
||||||
|
if (AppConfig.hideUsageBar) { return cb('USAGE_BAR_HIDDEN'); }
|
||||||
if (!common.isLoggedIn()) { return cb("NOT_LOGGED_IN"); }
|
if (!common.isLoggedIn()) { return cb("NOT_LOGGED_IN"); }
|
||||||
// getPinnedUsage updates common.account.usage, and other values
|
// getPinnedUsage updates common.account.usage, and other values
|
||||||
// so we can just use those and only check for errors
|
// so we can just use those and only check for errors
|
||||||
|
|
|
@ -2,7 +2,8 @@ define([
|
||||||
'/common/common-constants.js',
|
'/common/common-constants.js',
|
||||||
'/common/common-hash.js',
|
'/common/common-hash.js',
|
||||||
'/bower_components/localforage/dist/localforage.min.js',
|
'/bower_components/localforage/dist/localforage.min.js',
|
||||||
], function (Constants, Hash, localForage) {
|
'/customize/application_config.js',
|
||||||
|
], function (Constants, Hash, localForage, AppConfig) {
|
||||||
var LocalStore = {};
|
var LocalStore = {};
|
||||||
|
|
||||||
LocalStore.setThumbnail = function (key, value, cb) {
|
LocalStore.setThumbnail = function (key, value, cb) {
|
||||||
|
@ -115,6 +116,10 @@ define([
|
||||||
if (typeof (h) === "function") { h(); }
|
if (typeof (h) === "function") { h(); }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (typeof(AppConfig.customizeLogout) === 'function') {
|
||||||
|
return void AppConfig.customizeLogout(cb);
|
||||||
|
}
|
||||||
|
|
||||||
if (cb) { cb(); }
|
if (cb) { cb(); }
|
||||||
};
|
};
|
||||||
LocalStore.onLogout = function (h) {
|
LocalStore.onLogout = function (h) {
|
||||||
|
@ -125,6 +130,5 @@ define([
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return LocalStore;
|
return LocalStore;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue