infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

lint compliance

Browse Source
pull/1/head
yflory 5 years ago
parent a1431b7d09
commit 6100fdfd7a
3 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File

45
www/common/common-ui-elements.js
Unescape Escape View File

@ -229,6 +229,49 @@ define([
}; };
}; };
UIElements.noContactsMessage = function (common) {
var metadataMgr = common.getMetadataMgr();
var data = metadataMgr.getUserData();
var origin = metadataMgr.getPrivateData().origin;
if (common.isLoggedIn()) {
return {
content: h('p', Messages.share_noContactsLoggedIn),
buttons: [{
className: 'secondary',
name: Messages.share_copyProfileLink,
onClick: function () {
var profile = data.profile ? (origin + '/profile/#' + data.profile) : '';
var success = Clipboard.copy(profile);
if (success) { UI.log(Messages.shareSuccess); }
},
keys: [13]
}]
};
} else {
return {
content: h('p', Messages.share_noContactsNotLoggedIn),
buttons: [{
className: 'secondary',
name: Messages.login_register,
onClick: function () {
common.setLoginRedirect(function () {
common.gotoURL('/register/');
});
}
}, {
className: 'secondary',
name: Messages.login_login,
onClick: function () {
common.setLoginRedirect(function () {
common.gotoURL('/login/');
});
}
}
]
};
}
};
UIElements.createInviteTeamModal = function (config) { UIElements.createInviteTeamModal = function (config) {
var common = config.common; var common = config.common;
var hasFriends = Object.keys(config.friends || {}).length !== 0; var hasFriends = Object.keys(config.friends || {}).length !== 0;
@ -293,7 +336,7 @@ define([
buttons: contactsButtons buttons: contactsButtons
}; };
}; };
var friendsObject = hasFriends ? getContacts() : noContactsMessage(common); var friendsObject = hasFriends ? getContacts() : UIElements.noContactsMessage(common);
var friendsList = friendsObject.content; var friendsList = friendsObject.content;
var contactsButtons = friendsObject.buttons; var contactsButtons = friendsObject.buttons;
contactsButtons.unshift({ contactsButtons.unshift({

2
www/common/drive-ui.js
Unescape Escape View File

@ -4305,7 +4305,7 @@ define([
else if ($this.hasClass('cp-app-drive-context-share')) { else if ($this.hasClass('cp-app-drive-context-share')) {
if (paths.length !== 1) { return; } if (paths.length !== 1) { return; }
el = manager.find(paths[0].path); el = manager.find(paths[0].path);
var parsed, modal; var parsed;
var friends = common.getFriends(); var friends = common.getFriends();
var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn; var anonDrive = manager.isPathIn(currentPath, [FILES_DATA]) && !APP.loggedIn;

61
www/common/inner/share.js
Unescape Escape View File

@ -186,49 +186,6 @@ define([
}; };
}; };
var noContactsMessage = function(common){
var metadataMgr = common.getMetadataMgr();
var data = metadataMgr.getUserData();
var origin = metadataMgr.getPrivateData().origin;
if (common.isLoggedIn()) {
return {
content: h('p', Messages.share_noContactsLoggedIn),
buttons: [{
className: 'secondary',
name: Messages.share_copyProfileLink,
onClick: function () {
var profile = data.profile ? (origin + '/profile/#' + data.profile) : '';
var success = Clipboard.copy(profile);
if (success) { UI.log(Messages.shareSuccess); }
},
keys: [13]
}]
};
} else {
return {
content: h('p', Messages.share_noContactsNotLoggedIn),
buttons: [{
className: 'secondary',
name: Messages.login_register,
onClick: function () {
common.setLoginRedirect(function () {
common.gotoURL('/register/');
});
}
}, {
className: 'secondary',
name: Messages.login_login,
onClick: function () {
common.setLoginRedirect(function () {
common.gotoURL('/login/');
});
}
}
]
};
}
};
var getEditableTeams = function (common, config) { var getEditableTeams = function (common, config) {
var privateData = common.getMetadataMgr().getPrivateData(); var privateData = common.getMetadataMgr().getPrivateData();
var teamsData = Util.tryParse(JSON.stringify(privateData.teams)) || {}; var teamsData = Util.tryParse(JSON.stringify(privateData.teams)) || {};
@ -294,7 +251,7 @@ define([
h('a', {href: '#'}, Messages.passwordFaqLink) h('a', {href: '#'}, Messages.passwordFaqLink)
]); ]);
$(link).click(function () { $(link).click(function () {
common.openURL(opts.origin + "/faq.html#security-pad_password"); opts.common.openURL(opts.origin + "/faq.html#security-pad_password");
}); });
return link; return link;
}; };
@ -311,15 +268,11 @@ define([
var getContactsTab = function (Env, data, opts, _cb) { var getContactsTab = function (Env, data, opts, _cb) {
var cb = Util.once(Util.mkAsync(_cb)); var cb = Util.once(Util.mkAsync(_cb));
var common = Env.common; var common = Env.common;
var origin = opts.origin;
var pathname = opts.pathname;
var hashes = opts.hashes;
var teams = opts.teams;
var hasFriends = opts.hasFriends; var hasFriends = opts.hasFriends;
var onFriendShare = Util.mkEvent(); var onFriendShare = Util.mkEvent();
var friendsObject = hasFriends ? createShareWithFriends(opts, onFriendShare, opts.getLinkValue) : noContactsMessage(common); var friendsObject = hasFriends ? createShareWithFriends(opts, onFriendShare, opts.getLinkValue) : UIElements.noContactsMessage(common);
var friendsList = friendsObject.content; var friendsList = friendsObject.content;
onFriendShare.reg(opts.saveValue); onFriendShare.reg(opts.saveValue);
@ -461,10 +414,6 @@ define([
var getEmbedTab = function (Env, data, opts, _cb) { var getEmbedTab = function (Env, data, opts, _cb) {
var cb = Util.once(Util.mkAsync(_cb)); var cb = Util.once(Util.mkAsync(_cb));
var common = Env.common;
var origin = opts.origin;
var pathname = opts.pathname;
var hashes = opts.hashes;
var embedContent = [ var embedContent = [
h('p', Messages.viewEmbedTag), h('p', Messages.viewEmbedTag),
@ -733,7 +682,7 @@ define([
var getFileContactsTab = function (Env, data, opts, _cb) { var getFileContactsTab = function (Env, data, opts, _cb) {
var cb = Util.once(Util.mkAsync(_cb)); var cb = Util.once(Util.mkAsync(_cb));
var common = Env.common; var common = Env.common;
var friendsObject = opts.hasFriends ? createShareWithFriends(opts, null, opts.getLinkValue) : noContactsMessage(common); var friendsObject = opts.hasFriends ? createShareWithFriends(opts, null, opts.getLinkValue) : UIElements.noContactsMessage(common);
var friendsList = friendsObject.content; var friendsList = friendsObject.content;
var contactsContent = h('div.cp-share-modal'); var contactsContent = h('div.cp-share-modal');
@ -742,7 +691,7 @@ define([
// Show alert if the pad is password protected // Show alert if the pad is password protected
if (opts.hasPassword) { if (opts.hasPassword) {
linkContent.push(h('div.alert.alert-primary', [ $contactsContent.append(h('div.alert.alert-primary', [
h('i.fa.fa-lock'), h('i.fa.fa-lock'),
Messages.share_linkPasswordAlert, h('br'), Messages.share_linkPasswordAlert, h('br'),
makeFaqLink(opts) makeFaqLink(opts)
@ -832,7 +781,7 @@ define([
// Show alert if the pad is password protected // Show alert if the pad is password protected
if (opts.hasPassword) { if (opts.hasPassword) {
linkContent.push(h('div.alert.alert-primary', [ $(embed).append(h('div.alert.alert-primary', [
h('i.fa.fa-lock'), h('i.fa.fa-lock'),
Messages.share_linkPasswordAlert, h('br'), Messages.share_linkPasswordAlert, h('br'),
makeFaqLink(opts) makeFaqLink(opts)

Write Preview
Loading…
Cancel
Save