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

Fix missing pad title in notifications

Browse Source
This commit is contained in:
yflory 2019-07-04 15:51:29 +02:00
parent d41b314e4d
commit df5090eaef
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/sframe-common-title.js
View File

@ -79,7 +79,8 @@ define([
return { return {
updateTitle: exp.updateTitle, updateTitle: exp.updateTitle,
suggestName: suggestTitle, suggestName: suggestTitle,
defaultName: exp.defaultTitle defaultName: exp.defaultTitle,
getTitle: exp.getTitle
}; };
}; };

10
www/common/toolbar3.js
View File

@ -534,8 +534,11 @@ MessengerUI, Messages) {
hidden: true hidden: true
}); });
$shareBlock.click(function () { $shareBlock.click(function () {
var title = (config.title && config.title.getTitle && config.title.getTitle())
|| (config.title && config.title.defaultName)
|| "";
Common.getSframeChannel().event('EV_SHARE_OPEN', { Common.getSframeChannel().event('EV_SHARE_OPEN', {
title: Common.getMetadataMgr().getMetadata().title title: title
}); });
}); });
@ -559,7 +562,10 @@ MessengerUI, Messages) {
file: true file: true
}); });
$shareBlock.click(function () { $shareBlock.click(function () {
var title = (config.title && config.title.getTitle && config.title.getTitle())
|| "";
Common.getSframeChannel().event('EV_SHARE_OPEN', { Common.getSframeChannel().event('EV_SHARE_OPEN', {
title: title,
file: true file: true
}); });
}); });
@ -724,7 +730,7 @@ MessengerUI, Messages) {
}; };
var createPageTitle = function (toolbar, config) { var createPageTitle = function (toolbar, config) {
if (config.title || !config.pageTitle) { return; } if (!config.pageTitle) { return; }
var $titleContainer = $('<span>', { var $titleContainer = $('<span>', {
'class': TITLE_CLS 'class': TITLE_CLS
}).appendTo(toolbar.$top); }).appendTo(toolbar.$top);

5
www/file/inner.js
View File

@ -123,7 +123,10 @@ define([
common.setPadAttribute('fileType', metadata.type); common.setPadAttribute('fileType', metadata.type);
} }
toolbar.addElement(['pageTitle'], {pageTitle: title}); toolbar.addElement(['pageTitle'], {
pageTitle: title,
title: Title.getTitleConfig(),
});
toolbar.$rightside.append(common.createButton('forget', true)); toolbar.$rightside.append(common.createButton('forget', true));
toolbar.$rightside.append(common.createButton('properties', true)); toolbar.$rightside.append(common.createButton('properties', true));
if (common.isLoggedIn()) { if (common.isLoggedIn()) {