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

move 'getDefaultName' out of 'common-hash'

Browse Source
This commit is contained in:
ansuz
2019-09-05 12:22:30 +02:00
parent d7906f9132
commit 096b0fb44a
6 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/outer/async-store.js
View File

@@ -507,7 +507,7 @@ define([
roHref: roHref,
atime: now,
ctime: now,
title: title || Hash.getDefaultName(Hash.parsePadUrl(href)),
title: title || UserObject.getDefaultName(Hash.parsePadUrl(href)),
};
};
@@ -805,6 +805,8 @@ define([
var p = Hash.parsePadUrl(href);
var h = p.hashData;
if (title.trim() === "") { title = UserObject.getDefaultName(p); }
if (AppConfig.disableAnonymousStore && !store.loggedIn) { return void cb(); }
if (p.type === "debug") { return void cb(); }

2
www/common/outer/userObject.js
View File

@@ -694,7 +694,7 @@ define([
// Fix creation time
if (!el.ctime) { el.ctime = el.atime; }
// Fix title
if (!el.title) { el.title = Hash.getDefaultName(parsed); }
if (!el.title) { el.title = exp.getDefaultName(parsed); }
// Fix channel
if (!el.channel) {
try {