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

Merge branch 'staging' into team

Browse Source
This commit is contained in:
yflory
2019-09-10 15:32:05 +02:00
parent 2d7f7b895d 7e238245e6
commit 798296489a
19 changed files with 185 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,7 +406,11 @@ define([
$d.append(UI.dialog.selectable(owners, {
id: 'cp-app-prop-owners',
}));
if (owned) {
var parsed;
if (data.href || data.roHref) {
parsed = Hash.parsePadUrl(data.href || data.roHref);
}
if (owned && data.roHref && parsed.type !== 'drive' && parsed.hashData.type === 'pad') {
var manageOwners = h('button.no-margin', Messages.owner_openModalButton);
$(manageOwners).click(function () {
var modal = createOwnerModal(common, data);
@@ -445,7 +449,6 @@ define([
$d.append(password);
}
var parsed = Hash.parsePadUrl(data.href || data.roHref);
if (!data.noEditPassword && owned && parsed.hashData.type === 'pad' && parsed.type !== "sheet") { // FIXME SHEET fix password change for sheets
var sframeChan = common.getSframeChannel();
var changePwTitle = Messages.properties_changePassword;
@@ -590,7 +593,7 @@ define([
id: 'cp-app-prop-size',
}));
if (data.sharedFolder) {
if (data.sharedFolder && false) {
$('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d);
if (AppConfig.pinBugRecovery) { $d.append(h('p', AppConfig.pinBugRecovery)); }
$d.append(UI.dialog.selectable(data.channel, {