web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:xwiki-labs/cryptpad

Browse Source
This commit is contained in:
yflory
2017-02-21 10:42:35 +01:00
parent 0bdf59c1dd 38122d7785
commit 2103f0afa8
15 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/cryptpad-common.js
View File

@@ -2,7 +2,7 @@ define([
'/api/config?cb=' + Math.random().toString(16).slice(2),
'/customize/messages.js',
'/customize/fsStore.js',
'/bower_components/chainpad-crypto/crypto.js',
'/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
'/bower_components/alertifyjs/dist/js/alertify.js',
'/bower_components/spin.js/spin.min.js',
'/common/clipboard.js',
@@ -357,7 +357,7 @@ define([
title: pad[2] || hash && hash.slice(0,8),
ctime: pad[1],
};
} else if (typeof(pad) === 'object') {
} else if (pad && typeof(pad) === 'object') {
if (!pad.ctime) { pad.ctime = pad.atime; }
if (!pad.title) {
pad.href.replace(/#(.*)$/, function (x, hash) {
@@ -373,7 +373,7 @@ define([
} else {
console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
console.log(pad);
return {};
return;
}
}).filter(function (x) { return x; });
};