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:
ansuz
2019-07-08 12:11:08 +02:00
parent 8be6c84e2f df5090eaef
commit 0dee1143ba
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/common-ui-elements.js
View File

@@ -701,7 +701,10 @@ define([
}, },
keys: [13] keys: [13]
}]; }];
var frameLink = UI.dialog.customModal(link, {buttons: linkButtons}); var frameLink = UI.dialog.customModal(link, {
buttons: linkButtons,
onClose: config.onClose,
});
// Embed tab // Embed tab
var embed = h('div.cp-share-modal', [ var embed = h('div.cp-share-modal', [
@@ -728,7 +731,10 @@ define([
}, },
keys: [13] keys: [13]
}]; }];
var frameEmbed = UI.dialog.customModal(embed, { buttons: embedButtons}); var frameEmbed = UI.dialog.customModal(embed, {
buttons: embedButtons,
onClose: config.onClose,
});
// Create modal // Create modal
var tabs = [{ var tabs = [{

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()) {