Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 5 years ago
commit 49b082c032

@ -10,7 +10,7 @@
@alertify-input-fg: @colortheme_modal-input-fg; @alertify-input-fg: @colortheme_modal-input-fg;
input:not(.form-control), textarea { input:not(.form-control), textarea {
background-color: @alertify-input-fg; // background-color: @alertify-input-fg;
color: @cryptpad_text_col; color: @cryptpad_text_col;
border: 1px solid @alertify-input-bg; border: 1px solid @alertify-input-bg;
width: 100%; width: 100%;
@ -23,6 +23,10 @@
} }
} }
input:not(.form-control) {
height: @variables_input-height;
}
div.cp-alertify-type { div.cp-alertify-type {
display: flex; display: flex;
input { input {

@ -4,9 +4,9 @@
--LessLoader_require: LessLoader_currentFile(); --LessLoader_require: LessLoader_currentFile();
}; };
& { & {
@corner-button-ok: #2c9b00;
@corner-button-cancel: #990000;
@corner-link: #ffff7a; @corner-link: #ffff7a;
@corner-blue: @colortheme_logo-1;
@corner-white: @colortheme_base;
@keyframes appear { @keyframes appear {
0% { 0% {
@ -27,21 +27,23 @@
.cp-corner-container { .cp-corner-container {
position: absolute; position: absolute;
right: 0; right: 10px;
bottom: 0; bottom: 10px;
width: 300px; width: 350px;
height: 200px; padding: 10px;
border-top-left-radius: 200px; background-color: fade(@corner-blue, 95%);
padding: 15px; border: 1px solid @corner-blue;
text-align: right; color: @corner-white;
background-color: @colortheme_logo-1;
color: @colortheme_base;
z-index: 9999; z-index: 9999;
transform-origin: bottom right; transform-origin: bottom right;
animation: appear 0.8s ease-in-out; animation: appear 0.8s ease-in-out;
box-shadow: 0 0 10px 0 @colortheme_logo-1; //box-shadow: 0 0 10px 0 @corner-blue;
//transform: scale(0.1);
//transform: scale(1); &.cp-corner-alt {
background-color: fade(@corner-white, 95%);
border: 1px solid @corner-blue;
color: @corner-blue;
}
h1, h2, h3 { h1, h2, h3 {
font-size: 1.5em; font-size: 1.5em;
@ -64,7 +66,7 @@
line-height: 15px; line-height: 15px;
display: none; display: none;
&:hover { &:hover {
color: darken(@colortheme_base, 15%); color: darken(@corner-white, 15%);
} }
} }
.cp-corner-minimize { .cp-corner-minimize {
@ -86,46 +88,95 @@
} }
} }
&.cp-corner-big { &.cp-corner-big {
width: 400px; width: 500px;
height: 250px; }
.cp-corner-dontshow {
cursor: pointer;
.fa {
margin-right: 0.3em;
font-size: 1.1em;
}
&:hover {
color: darken(@corner-white, 10%);
}
}
&.cp-corner-alt {
.cp-corner-dontshow {
&:hover {
color: lighten(@corner-blue, 10%);
}
}
} }
.cp-corner-actions { .cp-corner-actions {
min-height: 30px; min-height: 30px;
margin: 15px auto; margin: 10px auto;
display: inline-block; display: block;
text-align: right;
} }
.cp-corner-footer { .cp-corner-footer {
font-style: italic;
font-size: 0.8em; font-size: 0.8em;
} }
.cp-corner-footer, .cp-corner-text { .cp-corner-footer, .cp-corner-text {
a { a {
color: @corner-link; color: @corner-white;
text-decoration: underline;
&:hover { &:hover {
color: darken(@corner-link, 20%); color: darken(@corner-white, 10%);
} }
} }
} }
&.cp-corner-alt a {
color: @corner-blue;
&:hover {
color: lighten(@corner-blue, 10%);
}
}
button { button {
border: 0px;
padding: 5px; padding: 5px;
color: @colortheme_base; color: @corner-white;
margin-left: 5px; &:not(:first-child) {
margin-left: 10px;
}
outline: none; outline: none;
text-transform: uppercase;
border: 1px solid @corner-white;
.fa, .cptools {
margin-right: 0.3em;
}
&.cp-corner-primary { &.cp-corner-primary {
background-color: @corner-button-ok; background-color: @corner-white;
font-weight: bold; color: @corner-blue;
&:hover { &:hover {
background-color: lighten(@corner-button-ok, 10%); background-color: lighten(@corner-blue, 50%);
border-color: lighten(@corner-blue, 50%);
} }
} }
&.cp-corner-cancel { &.cp-corner-cancel {
background-color: @corner-button-cancel; background-color: @corner-blue;
margin-left: 10px; color: @corner-white;
&:hover {
background-color: darken(@corner-blue, 10%);
}
}
}
&.cp-corner-alt button {
border-color: @corner-blue;
&.cp-corner-primary {
background-color: @corner-blue;
color: @corner-white;
&:hover {
background-color: darken(@corner-blue, 10%);
border-color: darken(@corner-blue, 10%);
}
}
&.cp-corner-cancel {
background-color: @corner-white;
color: @corner-blue;
&:hover { &:hover {
background-color: lighten(@corner-button-cancel, 10%); background-color: lighten(@corner-blue, 50%);
} }
} }
} }

@ -8,6 +8,7 @@
@notif-height: 50px; @notif-height: 50px;
.cp-notifications-container { .cp-notifications-container {
max-width: 300px; max-width: 300px;
width: 300px;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
& hr { & hr {
@ -16,6 +17,14 @@
.cp-notification { .cp-notification {
min-height: @notif-height; min-height: @notif-height;
display: flex; display: flex;
.cp-avatar {
.avatar_main(30px);
padding: 0 5px;
cursor: pointer;
&:hover {
background-color: rgba(0,0,0,0.1);
}
}
.cp-notification-content { .cp-notification-content {
flex: 1; flex: 1;
align-items: stretch; align-items: stretch;

@ -117,6 +117,7 @@
//border-radius: 0 0.25em 0.25em 0; //border-radius: 0 0.25em 0.25em 0;
//border: 1px solid #adadad; //border: 1px solid #adadad;
border-left: 0px; border-left: 0px;
height: @variables_input-height;
} }
} }
&>div { &>div {

@ -3,6 +3,7 @@
// Elements size // Elements size
@variables_bar-height: 32px; @variables_bar-height: 32px;
@variables_input-height: 38px;
// Used in modal.less and alertify.less // Used in modal.less and alertify.less
@variables_padding: 12px; @variables_padding: 12px;

@ -491,6 +491,11 @@ define([
$ok.focus(); $ok.focus();
Notifier.notify(); Notifier.notify();
}); });
return {
element: frame,
delete: close
};
}; };
UI.prompt = function (msg, def, cb, opt, force) { UI.prompt = function (msg, def, cb, opt, force) {
@ -1050,39 +1055,36 @@ define([
return radio; return radio;
}; };
var corner = {
queue: [],
state: false
};
UI.cornerPopup = function (text, actions, footer, opts) { UI.cornerPopup = function (text, actions, footer, opts) {
opts = opts || {}; opts = opts || {};
var minimize = h('div.cp-corner-minimize.fa.fa-window-minimize'); var dontShowAgain = h('div.cp-corner-dontshow', [
var maximize = h('div.cp-corner-maximize.fa.fa-window-maximize'); h('span.fa.fa-times'),
Messages.dontShowAgain || "Don't show again" // XXX
]);
var popup = h('div.cp-corner-container', [ var popup = h('div.cp-corner-container', [
minimize,
maximize,
h('div.cp-corner-filler', { style: "width:110px;" }),
h('div.cp-corner-filler', { style: "width:80px;" }),
h('div.cp-corner-filler', { style: "width:60px;" }),
h('div.cp-corner-filler', { style: "width:40px;" }),
h('div.cp-corner-filler', { style: "width:20px;" }),
setHTML(h('div.cp-corner-text'), text), setHTML(h('div.cp-corner-text'), text),
h('div.cp-corner-actions', actions), h('div.cp-corner-actions', actions),
setHTML(h('div.cp-corner-footer'), footer) setHTML(h('div.cp-corner-footer'), footer),
opts.dontShowAgain ? dontShowAgain : undefined
]); ]);
var $popup = $(popup); var $popup = $(popup);
$(minimize).click(function () {
$popup.addClass('cp-minimized');
});
$(maximize).click(function () {
$popup.removeClass('cp-minimized');
});
if (opts.hidden) { if (opts.hidden) {
$popup.addClass('cp-minimized'); $popup.addClass('cp-minimized');
} }
if (opts.big) { if (opts.big) {
$popup.addClass('cp-corner-big'); $popup.addClass('cp-corner-big');
} }
if (opts.alt) {
$popup.addClass('cp-corner-alt');
}
var hide = function () { var hide = function () {
$popup.hide(); $popup.hide();
@ -1092,9 +1094,28 @@ define([
}; };
var deletePopup = function () { var deletePopup = function () {
$popup.remove(); $popup.remove();
if (!corner.queue.length) {
corner.state = false;
return;
}
setTimeout(function () {
$('body').append(corner.queue.pop());
}, 5000);
}; };
$(dontShowAgain).click(function () {
deletePopup();
if (typeof(opts.dontShowAgain) === "function") {
opts.dontShowAgain();
}
});
if (corner.state) {
corner.queue.push(popup);
} else {
corner.state = true;
$('body').append(popup); $('body').append(popup);
}
return { return {
popup: popup, popup: popup,

@ -53,10 +53,18 @@ define([
return list; return list;
}; };
Msg.declineFriendRequest = function (store, data, cb) {
store.mailbox.sendTo('DECLINE_FRIEND_REQUEST', {}, {
channel: data.notifications,
curvePublic: data.curvePublic
}, function (obj) {
cb(obj);
});
};
Msg.acceptFriendRequest = function (store, data, cb) { Msg.acceptFriendRequest = function (store, data, cb) {
var friend = getFriend(store.proxy, data.curvePublic) || {}; var friend = getFriend(store.proxy, data.curvePublic) || {};
var myData = createData(store.proxy, friend.channel || data.channel); var myData = createData(store.proxy, friend.channel || data.channel);
store.mailbox.sendTo('ACCEPT_FRIEND_REQUEST', myData, { store.mailbox.sendTo('ACCEPT_FRIEND_REQUEST', { user: myData }, {
channel: data.notifications, channel: data.notifications,
curvePublic: data.curvePublic curvePublic: data.curvePublic
}, function (obj) { }, function (obj) {
@ -110,7 +118,7 @@ define([
var proxy = store.proxy; var proxy = store.proxy;
var friend = proxy.friends[curvePublic]; var friend = proxy.friends[curvePublic];
if (!friend) { return void cb({error: 'ENOENT'}); } if (!friend) { return void cb({error: 'ENOENT'}); }
if (!friend.notifications || !friend.channel) { return void cb({error: 'EINVAL'}); } if (!friend.notifications) { return void cb({error: 'EINVAL'}); }
store.mailbox.sendTo('UNFRIEND', { store.mailbox.sendTo('UNFRIEND', {
curvePublic: proxy.curvePublic curvePublic: proxy.curvePublic

@ -56,6 +56,21 @@ define([
}); });
}; };
var dcAlert;
UIElements.disconnectAlert = function () {
if (dcAlert && $(dcAlert.element).length) { return; }
dcAlert = UI.alert(Messages.common_connectionLost, undefined, true);
};
UIElements.reconnectAlert = function () {
if (!dcAlert) { return; }
if (!dcAlert.delete) {
dcAlert = undefined;
return;
}
dcAlert.delete();
dcAlert = undefined;
};
var importContent = function (type, f, cfg) { var importContent = function (type, f, cfg) {
return function () { return function () {
var $files = $('<input>', {type:"file"}); var $files = $('<input>', {type:"file"});
@ -212,15 +227,7 @@ define([
common.mailbox.sendTo("RM_OWNER", { common.mailbox.sendTo("RM_OWNER", {
channel: channel, channel: channel,
title: data.title, title: data.title,
pending: pending, pending: pending
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: friend.notifications, channel: friend.notifications,
curvePublic: friend.curvePublic curvePublic: friend.curvePublic
@ -363,15 +370,7 @@ define([
channel: channel, channel: channel,
href: data.href, href: data.href,
password: data.password, password: data.password,
title: data.title, title: data.title
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: friend.notifications, channel: friend.notifications,
curvePublic: friend.curvePublic curvePublic: friend.curvePublic
@ -4097,27 +4096,32 @@ define([
}; };
var crowdfundingState = false; var crowdfundingState = false;
UIElements.displayCrowdfunding = function (common) { UIElements.displayCrowdfunding = function (common, force) {
if (crowdfundingState) { return; } if (crowdfundingState) { return; }
if (AppConfig.disableCrowdfundingMessages) { return; }
var priv = common.getMetadataMgr().getPrivateData(); var priv = common.getMetadataMgr().getPrivateData();
if (priv.plan) { return; }
var todo = function () {
crowdfundingState = true; crowdfundingState = true;
setTimeout(function () {
common.getAttribute(['general', 'crowdfunding'], function (err, val) {
if (err || val === false) { return; }
common.getSframeChannel().query('Q_GET_PINNED_USAGE', null, function (err, obj) {
var quotaMb = obj.quota / (1024 * 1024);
if (quotaMb < 10) { return; }
// Display the popup // Display the popup
var text = Messages.crowdfunding_popup_text; var text = Messages.crowdfunding_popup_text;
var yes = h('button.cp-corner-primary', Messages.crowdfunding_popup_yes); var yes = h('button.cp-corner-primary', [
var no = h('button.cp-corner-primary', Messages.crowdfunding_popup_no); h('span.fa.fa-external-link'),
var never = h('button.cp-corner-cancel', Messages.crowdfunding_popup_never); 'OpenCollective'
var actions = h('div', [yes, no, never]); ]);
var no = h('button.cp-corner-cancel', Messages.crowdfunding_popup_no);
var actions = h('div', [no, yes]);
var dontShowAgain = function () {
common.setAttribute(['general', 'crowdfunding'], false);
Feedback.send('CROWDFUNDING_NEVER');
};
var modal = UI.cornerPopup(text, actions, null, {big: true}); var modal = UI.cornerPopup(text, actions, null, {
big: true,
alt: true,
dontShowAgain: dontShowAgain
});
$(yes).click(function () { $(yes).click(function () {
modal.delete(); modal.delete();
@ -4135,14 +4139,25 @@ define([
modal.delete(); modal.delete();
Feedback.send('CROWDFUNDING_NO'); Feedback.send('CROWDFUNDING_NO');
}); });
$(never).click(function () { };
modal.delete();
common.setAttribute(['general', 'crowdfunding'], false); if (force) {
Feedback.send('CROWDFUNDING_NEVER'); crowdfundingState = true;
}); return void todo();
}
if (AppConfig.disableCrowdfundingMessages) { return; }
if (priv.plan) { return; }
crowdfundingState = true;
common.getAttribute(['general', 'crowdfunding'], function (err, val) {
if (err || val === false) { return; }
common.getSframeChannel().query('Q_GET_PINNED_USAGE', null, function (err, obj) {
var quotaMb = obj.quota / (1024 * 1024);
if (quotaMb < 10) { return; }
todo();
}); });
}); });
}, 5000);
}; };
var storePopupState = false; var storePopupState = false;
@ -4164,7 +4179,7 @@ define([
var hide = h('button.cp-corner-cancel', Messages.autostore_hide); var hide = h('button.cp-corner-cancel', Messages.autostore_hide);
var store = h('button.cp-corner-primary', Messages.autostore_store); var store = h('button.cp-corner-primary', Messages.autostore_store);
var actions = h('div', [store, hide]); var actions = h('div', [hide, store]);
var initialHide = data && data.autoStore && data.autoStore === -1; var initialHide = data && data.autoStore && data.autoStore === -1;
var modal = UI.cornerPopup(text, actions, footer, {hidden: initialHide}); var modal = UI.cornerPopup(text, actions, footer, {hidden: initialHide});
@ -4319,7 +4334,8 @@ define([
UIElements.displayFriendRequestModal = function (common, data) { UIElements.displayFriendRequestModal = function (common, data) {
var msg = data.content.msg; var msg = data.content.msg;
var text = Messages._getKey('contacts_request', [Util.fixHTML(msg.content.displayName)]); var userData = msg.content.user;
var text = Messages._getKey('contacts_request', [Util.fixHTML(userData.displayName)]);
var todo = function (yes) { var todo = function (yes) {
common.getSframeChannel().query("Q_ANSWER_FRIEND_REQUEST", { common.getSframeChannel().query("Q_ANSWER_FRIEND_REQUEST", {
@ -4346,7 +4362,6 @@ define([
UIElements.displayAddOwnerModal = function (common, data) { UIElements.displayAddOwnerModal = function (common, data) {
var priv = common.getMetadataMgr().getPrivateData(); var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();
var msg = data.content.msg; var msg = data.content.msg;
@ -4381,15 +4396,7 @@ define([
href: msg.content.href, href: msg.content.href,
password: msg.content.password, password: msg.content.password,
title: msg.content.title, title: msg.content.title,
answer: yes, answer: yes
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: msg.content.user.notifications, channel: msg.content.user.notifications,
curvePublic: msg.content.user.curvePublic curvePublic: msg.content.user.curvePublic
@ -4470,7 +4477,6 @@ define([
}; };
UIElements.displayAddTeamOwnerModal = function (common, data) { UIElements.displayAddTeamOwnerModal = function (common, data) {
var priv = common.getMetadataMgr().getPrivateData(); var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();
var msg = data.content.msg; var msg = data.content.msg;
@ -4487,15 +4493,7 @@ define([
common.mailbox.sendTo("ADD_OWNER_ANSWER", { common.mailbox.sendTo("ADD_OWNER_ANSWER", {
teamChannel: msg.content.teamChannel, teamChannel: msg.content.teamChannel,
title: msg.content.title, title: msg.content.title,
answer: yes, answer: yes
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: msg.content.user.notifications, channel: msg.content.user.notifications,
curvePublic: msg.content.user.curvePublic curvePublic: msg.content.user.curvePublic
@ -4611,8 +4609,6 @@ define([
}; };
UIElements.displayInviteTeamModal = function (common, data) { UIElements.displayInviteTeamModal = function (common, data) {
var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var msg = data.content.msg; var msg = data.content.msg;
var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous; var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
@ -4633,15 +4629,7 @@ define([
common.mailbox.sendTo("INVITE_TO_TEAM_ANSWER", { common.mailbox.sendTo("INVITE_TO_TEAM_ANSWER", {
answer: yes, answer: yes,
teamChannel: msg.content.team.channel, teamChannel: msg.content.team.channel,
teamName: teamName, teamName: teamName
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: msg.content.user.notifications, channel: msg.content.user.notifications,
curvePublic: msg.content.user.curvePublic curvePublic: msg.content.user.curvePublic

@ -29,7 +29,9 @@ define([
handlers['FRIEND_REQUEST'] = function (common, data) { handlers['FRIEND_REQUEST'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
var name = Util.fixHTML(msg.content.displayName) || Messages.anonymous; var userData = msg.content.user || msg.content;
var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
msg.content = { user: userData };
// Display the notification // Display the notification
content.getFormatText = function () { content.getFormatText = function () {
@ -37,7 +39,7 @@ define([
}; };
// Check authenticity // Check authenticity
if (msg.author !== msg.content.curvePublic) { return; } if (msg.author !== userData.curvePublic) { return; }
// if not archived, add handlers // if not archived, add handlers
if (!content.archived) { if (!content.archived) {
@ -51,7 +53,11 @@ define([
handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) { handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
var name = Util.fixHTML(msg.content.name) || Messages.anonymous; var userData = typeof(msg.content.user) === "object" ? msg.content.user : {
displayName: msg.content.name,
curvePublic: msg.content.user
};
var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_accepted', [name]); return Messages._getKey('friendRequest_accepted', [name]);
}; };
@ -63,7 +69,11 @@ define([
handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) { handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
var name = Util.fixHTML(msg.content.name) || Messages.anonymous; var userData = typeof(msg.content.user) === "object" ? msg.content.user : {
displayName: msg.content.name,
curvePublic: msg.content.user
};
var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_declined', [name]); return Messages._getKey('friendRequest_declined', [name]);
}; };

@ -1606,17 +1606,10 @@ define([
pinImages(); pinImages();
}; };
config.onAbort = function () {
// inform of network disconnect
setEditable(false);
toolbar.failed();
UI.alert(Messages.common_connectionLost, undefined, true);
};
config.onConnectionChange = function (info) { config.onConnectionChange = function (info) {
if (info.state) { if (info.state) {
// If we tried to send changes while we were offline, force a page reload // If we tried to send changes while we were offline, force a page reload
UI.findOKButton().click(); UIElements.reconnectAlert();
if (Object.keys(pendingChanges).length) { if (Object.keys(pendingChanges).length) {
return void UI.confirm(Messages.oo_reconnect, function (yes) { return void UI.confirm(Messages.oo_reconnect, function (yes) {
if (!yes) { return; } if (!yes) { return; }
@ -1629,7 +1622,7 @@ define([
setEditable(false); setEditable(false);
offline = true; offline = true;
UI.findOKButton().click(); UI.findOKButton().click();
UI.alert(Messages.common_connectionLost, undefined, true); UIElements.disconnectAlert();
} }
}; };

@ -1267,15 +1267,15 @@ define([
// If we accept the request, add the friend to the list // If we accept the request, add the friend to the list
if (value) { if (value) {
Messaging.acceptFriendRequest(store, msg.content, function (obj) { Messaging.acceptFriendRequest(store, msg.content.user, function (obj) {
if (obj && obj.error) { return void cb(obj); } if (obj && obj.error) { return void cb(obj); }
Messaging.addToFriendList({ Messaging.addToFriendList({
proxy: store.proxy, proxy: store.proxy,
realtime: store.realtime, realtime: store.realtime,
pinPads: function (data, cb) { Store.pinPads(null, data, cb); }, pinPads: function (data, cb) { Store.pinPads(null, data, cb); },
}, msg.content, function (err) { }, msg.content.user, function (err) {
if (store.messenger) { if (store.messenger) {
store.messenger.onFriendAdded(msg.content); store.messenger.onFriendAdded(msg.content.user);
} }
broadcast([], "UPDATE_METADATA"); broadcast([], "UPDATE_METADATA");
if (err) { return void cb({error: err}); } if (err) { return void cb({error: err}); }
@ -1285,12 +1285,7 @@ define([
return; return;
} }
// Otherwise, just remove the notification // Otherwise, just remove the notification
store.mailbox.sendTo('DECLINE_FRIEND_REQUEST', { Messaging.declineFriendRequest(store, msg.content.user, function (obj) {
displayName: store.proxy['cryptpad.username']
}, {
channel: msg.content.notifications,
curvePublic: msg.content.curvePublic
}, function (obj) {
broadcast([], "UPDATE_METADATA"); broadcast([], "UPDATE_METADATA");
cb(obj); cb(obj);
}); });
@ -1312,8 +1307,9 @@ define([
store.proxy.friends_pending[data.curvePublic] = +new Date(); store.proxy.friends_pending[data.curvePublic] = +new Date();
broadcast([], "UPDATE_METADATA"); broadcast([], "UPDATE_METADATA");
var myData = Messaging.createData(store.proxy); store.mailbox.sendTo('FRIEND_REQUEST', {
store.mailbox.sendTo('FRIEND_REQUEST', myData, { user: Messaging.createData(store.proxy)
}, {
channel: data.notifications, channel: data.notifications,
curvePublic: data.curvePublic curvePublic: data.curvePublic
}, function (obj) { }, function (obj) {
@ -1649,11 +1645,8 @@ define([
// If send is true, send the request to the owner. // If send is true, send the request to the owner.
if (owner) { if (owner) {
if (data.send) { if (data.send) {
var myData = Messaging.createData(store.proxy);
delete myData.channel;
store.mailbox.sendTo('REQUEST_PAD_ACCESS', { store.mailbox.sendTo('REQUEST_PAD_ACCESS', {
channel: data.channel, channel: data.channel
user: myData
}, { }, {
channel: owner.notifications, channel: owner.notifications,
curvePublic: owner.curvePublic curvePublic: owner.curvePublic
@ -1687,13 +1680,10 @@ define([
} }
})) { return void cb({error: 'ENOTFOUND'}); } })) { return void cb({error: 'ENOTFOUND'}); }
var myData = Messaging.createData(store.proxy);
delete myData.channel;
store.mailbox.sendTo("GIVE_PAD_ACCESS", { store.mailbox.sendTo("GIVE_PAD_ACCESS", {
channel: channel, channel: channel,
href: href, href: href,
title: title, title: title
user: myData
}, { }, {
channel: data.user.notifications, channel: data.user.notifications,
curvePublic: data.user.curvePublic curvePublic: data.user.curvePublic
@ -1727,13 +1717,11 @@ define([
} }
// Tell all the owners that the pad was deleted from the server // Tell all the owners that the pad was deleted from the server
var curvePublic = store.proxy.curvePublic; var curvePublic = store.proxy.curvePublic;
var myData = Messaging.createData(store.proxy, false);
m.forEach(function (obj) { m.forEach(function (obj) {
var mb = JSON.parse(obj); var mb = JSON.parse(obj);
if (mb.curvePublic === curvePublic) { return; } if (mb.curvePublic === curvePublic) { return; }
store.mailbox.sendTo('OWNED_PAD_REMOVED', { store.mailbox.sendTo('OWNED_PAD_REMOVED', {
channel: channel, channel: channel
user: myData
}, { }, {
channel: mb.notifications, channel: mb.notifications,
curvePublic: mb.curvePublic curvePublic: mb.curvePublic

@ -4,6 +4,7 @@ define([
'/common/common-util.js', '/common/common-util.js',
], function (Messaging, Hash, Util) { ], function (Messaging, Hash, Util) {
// Random timeout between 10 and 30 times your sync time (lag + chainpad sync)
var getRandomTimeout = function (ctx) { var getRandomTimeout = function (ctx) {
var lag = ctx.store.realtime.getLag().lag || 0; var lag = ctx.store.realtime.getLag().lag || 0;
return (Math.max(0, lag) + 300) * 20 * (0.5 + Math.random()); return (Math.max(0, lag) + 300) * 20 * (0.5 + Math.random());
@ -22,9 +23,11 @@ define([
// Store the friend request displayed to avoid duplicates // Store the friend request displayed to avoid duplicates
var friendRequest = {}; var friendRequest = {};
handlers['FRIEND_REQUEST'] = function (ctx, box, data, cb) { handlers['FRIEND_REQUEST'] = function (ctx, box, data, cb) {
// Old format: data was stored directly in "content"
var userData = data.msg.content.user || data.msg.content;
// Check if the request is valid (send by the correct user) // Check if the request is valid (send by the correct user)
if (data.msg.author !== data.msg.content.curvePublic) { if (data.msg.author !== userData.curvePublic) {
return void cb(true); return void cb(true);
} }
@ -40,7 +43,8 @@ define([
if (Messaging.getFriend(ctx.store.proxy, data.msg.author) || if (Messaging.getFriend(ctx.store.proxy, data.msg.author) ||
ctx.store.proxy.friends_pending[data.msg.author]) { ctx.store.proxy.friends_pending[data.msg.author]) {
delete ctx.store.proxy.friends_pending[data.msg.author]; delete ctx.store.proxy.friends_pending[data.msg.author];
Messaging.acceptFriendRequest(ctx.store, data.msg.content, function (obj) {
Messaging.acceptFriendRequest(ctx.store, userData, function (obj) {
if (obj && obj.error) { if (obj && obj.error) {
return void cb(); return void cb();
} }
@ -48,10 +52,10 @@ define([
proxy: ctx.store.proxy, proxy: ctx.store.proxy,
realtime: ctx.store.realtime, realtime: ctx.store.realtime,
pinPads: ctx.pinPads pinPads: ctx.pinPads
}, data.msg.content, function (err) { }, userData, function (err) {
if (err) { console.error(err); } if (err) { return void console.error(err); }
if (ctx.store.messenger) { if (ctx.store.messenger) {
ctx.store.messenger.onFriendAdded(data.msg.content); ctx.store.messenger.onFriendAdded(userData);
} }
}); });
ctx.updateMetadata(); ctx.updateMetadata();
@ -63,96 +67,110 @@ define([
cb(); cb();
}; };
removeHandlers['FRIEND_REQUEST'] = function (ctx, box, data) { removeHandlers['FRIEND_REQUEST'] = function (ctx, box, data) {
if (friendRequest[data.content.curvePublic]) { var userData = data.content.user || data.content;
delete friendRequest[data.content.curvePublic]; if (friendRequest[userData.curvePublic]) {
delete friendRequest[userData.curvePublic];
} }
}; };
// The DECLINE and ACCEPT messages act on the contacts data
// They are processed with a random timeout to avoid having
// multiple workers trying to add or remove the contacts at
// the same time. Once processed, they are dismissed.
// We must dismiss them and send another message to our own
// mailbox for the UI part otherwise it would automatically
// accept or decline future requests from the same user
// until the message is manually dismissed.
var friendRequestDeclined = {}; var friendRequestDeclined = {};
handlers['DECLINE_FRIEND_REQUEST'] = function (ctx, box, data, cb) { handlers['DECLINE_FRIEND_REQUEST'] = function (ctx, box, data, cb) {
setTimeout(function () { // Old format: data was stored directly in "content"
var userData = data.msg.content.user || data.msg.content;
if (!userData.curvePublic) { userData.curvePublic = data.msg.author; }
// Our friend request was declined. // Our friend request was declined.
if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; } setTimeout(function () {
// Only dismissed once in the timeout to make sure we won't lose
// the data if we close the worker before adding the friend
cb(true);
// Make sure we really sent it
if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; }
// Remove the pending message and display the "declined" state in the UI // Remove the pending message and display the "declined" state in the UI
delete ctx.store.proxy.friends_pending[data.msg.author]; delete ctx.store.proxy.friends_pending[data.msg.author];
ctx.updateMetadata(); ctx.updateMetadata();
if (friendRequestDeclined[data.msg.author]) { return; } if (friendRequestDeclined[data.msg.author]) { return; }
friendRequestDeclined[data.msg.author] = true;
box.sendMessage({ box.sendMessage({
type: 'FRIEND_REQUEST_DECLINED', type: 'FRIEND_REQUEST_DECLINED',
content: { content: { user: userData }
user: data.msg.author, }, function () {});
name: data.msg.content.displayName
}
}, function () {
if (friendRequestDeclined[data.msg.author]) {
// TODO remove our message because another one was sent first?
}
friendRequestDeclined[data.msg.author] = true;
});
}, getRandomTimeout(ctx)); }, getRandomTimeout(ctx));
cb(true);
}; };
// UI for declined friend request
handlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data, cb) { handlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data, cb) {
ctx.updateMetadata(); ctx.updateMetadata();
if (friendRequestDeclined[data.msg.content.user]) { return void cb(true); } var curve = data.msg.content.user.curvePublic || data.msg.content.user;
friendRequestDeclined[data.msg.content.user] = true; if (friendRequestDeclined[curve]) { return void cb(true); }
friendRequestDeclined[curve] = true;
cb(); cb();
}; };
removeHandlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data) { removeHandlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data) {
if (friendRequestDeclined[data.content.user]) { var curve = data.content.user.curvePublic || data.content.user;
delete friendRequestDeclined[data.content.user]; if (friendRequestDeclined[curve]) { delete friendRequestDeclined[curve]; }
}
}; };
var friendRequestAccepted = {}; var friendRequestAccepted = {};
handlers['ACCEPT_FRIEND_REQUEST'] = function (ctx, box, data, cb) { handlers['ACCEPT_FRIEND_REQUEST'] = function (ctx, box, data, cb) {
// Old format: data was stored directly in "content"
var userData = data.msg.content.user || data.msg.content;
// Our friend request was accepted. // Our friend request was accepted.
setTimeout(function () { setTimeout(function () {
// Only dismissed once in the timeout to make sure we won't lose
// the data if we close the worker before adding the friend
cb(true);
// Make sure we really sent it // Make sure we really sent it
if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; } if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; }
// Remove the pending state. It will also us to send a new request in case of error
delete ctx.store.proxy.friends_pending[data.msg.author];
// And add the friend // And add the friend
Messaging.addToFriendList({ Messaging.addToFriendList({
proxy: ctx.store.proxy, proxy: ctx.store.proxy,
realtime: ctx.store.realtime, realtime: ctx.store.realtime,
pinPads: ctx.pinPads pinPads: ctx.pinPads
}, data.msg.content, function (err) { }, userData, function (err) {
if (err) { console.error(err); } if (err) { return void console.error(err); }
delete ctx.store.proxy.friends_pending[data.msg.author]; // Load the chat if contacts app loaded
if (ctx.store.messenger) { if (ctx.store.messenger) { ctx.store.messenger.onFriendAdded(userData); }
ctx.store.messenger.onFriendAdded(data.msg.content); // Update the userlist
}
ctx.updateMetadata(); ctx.updateMetadata();
// If you have a profile page open, update it // If you have a profile page open, update it
if (ctx.store.modules['profile']) { ctx.store.modules['profile'].update(); } if (ctx.store.modules['profile']) { ctx.store.modules['profile'].update(); }
if (friendRequestAccepted[data.msg.author]) { return; }
// Display the "accepted" state in the UI // Display the "accepted" state in the UI
if (friendRequestAccepted[data.msg.author]) { return; }
friendRequestAccepted[data.msg.author] = true;
box.sendMessage({ box.sendMessage({
type: 'FRIEND_REQUEST_ACCEPTED', type: 'FRIEND_REQUEST_ACCEPTED',
content: { content: { user: userData }
user: data.msg.author, }, function () {});
name: data.msg.content.displayName
}
}, function () {
if (friendRequestAccepted[data.msg.author]) {
// TODO remove our message because another one was sent first?
}
friendRequestAccepted[data.msg.author] = true;
});
}); });
}, getRandomTimeout(ctx)); }, getRandomTimeout(ctx));
cb(true);
}; };
// UI for accepted friend request
handlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data, cb) { handlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data, cb) {
ctx.updateMetadata(); ctx.updateMetadata();
if (friendRequestAccepted[data.msg.content.user]) { return void cb(true); } var curve = data.msg.content.user.curvePublic || data.msg.content.user;
friendRequestAccepted[data.msg.content.user] = true; if (friendRequestAccepted[curve]) { return void cb(true); }
friendRequestAccepted[curve] = true;
cb(); cb();
}; };
removeHandlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data) { removeHandlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data) {
if (friendRequestAccepted[data.content.user]) { var curve = data.content.user.curvePublic || data.content.user;
delete friendRequestAccepted[data.content.user]; if (friendRequestAccepted[curve]) { delete friendRequestAccepted[curve]; }
}
}; };
handlers['UNFRIEND'] = function (ctx, box, data, cb) { handlers['UNFRIEND'] = function (ctx, box, data, cb) {

@ -2,11 +2,12 @@ define([
'/common/common-util.js', '/common/common-util.js',
'/common/common-hash.js', '/common/common-hash.js',
'/common/common-realtime.js', '/common/common-realtime.js',
'/common/common-messaging.js',
'/common/notify.js', '/common/notify.js',
'/common/outer/mailbox-handlers.js', '/common/outer/mailbox-handlers.js',
'/bower_components/chainpad-netflux/chainpad-netflux.js', '/bower_components/chainpad-netflux/chainpad-netflux.js',
'/bower_components/chainpad-crypto/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
], function (Util, Hash, Realtime, Notify, Handlers, CpNetflux, Crypto) { ], function (Util, Hash, Realtime, Messaging, Notify, Handlers, CpNetflux, Crypto) {
var Mailbox = {}; var Mailbox = {};
var TYPES = [ var TYPES = [
@ -96,6 +97,12 @@ proxy.mailboxes = {
var crypto = Crypto.Mailbox.createEncryptor(keys); var crypto = Crypto.Mailbox.createEncryptor(keys);
// Always send your data
if (typeof(msg) === "object" && !msg.user) {
var myData = Messaging.createData(ctx.store.proxy, false);
msg.user = myData;
}
var text = JSON.stringify({ var text = JSON.stringify({
type: type, type: type,
content: msg content: msg
@ -187,6 +194,11 @@ proxy.mailboxes = {
history: [], // All the hashes loaded from the server in corretc order history: [], // All the hashes loaded from the server in corretc order
content: {}, // Content of the messages that should be displayed content: {}, // Content of the messages that should be displayed
sendMessage: function (msg) { // To send a message to our box sendMessage: function (msg) { // To send a message to our box
// Always send your data
if (typeof(msg) === "object" && !msg.user) {
var myData = Messaging.createData(ctx.store.proxy, false);
msg.user = myData;
}
try { try {
msg = JSON.stringify(msg); msg = JSON.stringify(msg);
} catch (e) { } catch (e) {

@ -909,13 +909,11 @@ define([
})); }));
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
// Send mailbox to offer ownership // Send mailbox to offer ownership
var myData = Messaging.createData(ctx.store.proxy, false);
ctx.store.mailbox.sendTo("ADD_OWNER", { ctx.store.mailbox.sendTo("ADD_OWNER", {
teamChannel: teamData.channel, teamChannel: teamData.channel,
chatChannel: Util.find(teamData, ['keys', 'chat', 'channel']), chatChannel: Util.find(teamData, ['keys', 'chat', 'channel']),
rosterChannel: Util.find(teamData, ['keys', 'roster', 'channel']), rosterChannel: Util.find(teamData, ['keys', 'roster', 'channel']),
title: teamData.metadata.name, title: teamData.metadata.name
user: myData
}, { }, {
channel: user.notifications, channel: user.notifications,
curvePublic: user.curvePublic curvePublic: user.curvePublic
@ -969,12 +967,10 @@ define([
})); }));
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
// Send mailbox to offer ownership // Send mailbox to offer ownership
var myData = Messaging.createData(ctx.store.proxy, false);
ctx.store.mailbox.sendTo("RM_OWNER", { ctx.store.mailbox.sendTo("RM_OWNER", {
teamChannel: teamData.channel, teamChannel: teamData.channel,
title: teamData.metadata.name, title: teamData.metadata.name,
pending: isPendingOwner, pending: isPendingOwner
user: myData
}, { }, {
channel: user.notifications, channel: user.notifications,
curvePublic: user.curvePublic curvePublic: user.curvePublic
@ -1104,11 +1100,9 @@ define([
if (!team) { return void cb ({error: 'ENOENT'}); } if (!team) { return void cb ({error: 'ENOENT'}); }
// Send mailbox to offer ownership // Send mailbox to offer ownership
var myData = Messaging.createData(ctx.store.proxy, false);
ctx.store.mailbox.sendTo("TEAM_EDIT_RIGHTS", { ctx.store.mailbox.sendTo("TEAM_EDIT_RIGHTS", {
state: state, state: state,
teamData: getInviteData(ctx, teamId, state), teamData: getInviteData(ctx, teamId, state)
user: myData
}, { }, {
channel: user.notifications, channel: user.notifications,
curvePublic: user.curvePublic curvePublic: user.curvePublic
@ -1175,7 +1169,6 @@ define([
team.roster.add(obj, function (err) { team.roster.add(obj, function (err) {
if (err && err !== 'NO_CHANGE') { return void cb({error: err}); } if (err && err !== 'NO_CHANGE') { return void cb({error: err}); }
ctx.store.mailbox.sendTo('INVITE_TO_TEAM', { ctx.store.mailbox.sendTo('INVITE_TO_TEAM', {
user: Messaging.createData(ctx.store.proxy, false),
team: getInviteData(ctx, teamId) team: getInviteData(ctx, teamId)
}, { }, {
channel: user.notifications, channel: user.notifications,
@ -1202,7 +1195,6 @@ define([
if (!userData || !userData.notifications) { return cb(); } if (!userData || !userData.notifications) { return cb(); }
ctx.store.mailbox.sendTo('KICKED_FROM_TEAM', { ctx.store.mailbox.sendTo('KICKED_FROM_TEAM', {
pending: data.pending, pending: data.pending,
user: Messaging.createData(ctx.store.proxy, false),
teamChannel: getInviteData(ctx, teamId).channel, teamChannel: getInviteData(ctx, teamId).channel,
teamName: getInviteData(ctx, teamId).metadata.name teamName: getInviteData(ctx, teamId).metadata.name
}, { }, {

@ -396,9 +396,9 @@ define([
if (state === STATE.DELETED) { return; } if (state === STATE.DELETED) { return; }
stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED, info.permanent); stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED, info.permanent);
/*if (info.state) { /*if (info.state) {
UI.findOKButton().click(); UIElements.reconnectAlert();
} else { } else {
UI.alert(Messages.common_connectionLost, undefined, true); UIElements.disconnectAlert();
}*/ }*/
}; };

@ -62,15 +62,16 @@ define([
}); });
editor._noCursorUpdate = false; editor._noCursorUpdate = false;
editor.state.focused = true; editor.scrollTo(scroll.left, scroll.top);
if (!editor.state.focused) { return; }
if(selects[0] === selects[1]) { if(selects[0] === selects[1]) {
editor.setCursor(posToCursor(selects[0], remoteDoc)); editor.setCursor(posToCursor(selects[0], remoteDoc));
} }
else { else {
editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc)); editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
} }
editor.scrollTo(scroll.left, scroll.top);
}; };
module.getHeadingText = function (editor) { module.getHeadingText = function (editor) {

@ -1,12 +1,13 @@
define([ define([
'jquery', 'jquery',
'/common/common-util.js', '/common/common-util.js',
'/common/common-hash.js',
'/common/common-interface.js', '/common/common-interface.js',
'/common/common-ui-elements.js', '/common/common-ui-elements.js',
'/common/notifications.js', '/common/notifications.js',
'/common/hyperscript.js', '/common/hyperscript.js',
'/customize/messages.js', '/customize/messages.js',
], function ($, Util, UI, UIElements, Notifications, h, Messages) { ], function ($, Util, Hash, UI, UIElements, Notifications, h, Messages) {
var Mailbox = {}; var Mailbox = {};
Mailbox.create = function (Common) { Mailbox.create = function (Common) {
@ -53,9 +54,23 @@ define([
}; };
var createElement = mailbox.createElement = function (data) { var createElement = mailbox.createElement = function (data) {
var notif; var notif;
var avatar;
var userData = Util.find(data, ['content', 'msg', 'content', 'user']);
if (userData && typeof(userData) === "object" && userData.profile) {
avatar = h('span.cp-avatar');
Common.displayAvatar($(avatar), userData.avatar, userData.displayName || userData.name);
$(avatar).click(function (e) {
e.stopPropagation();
Common.openURL(Hash.hashToHref(userData.profile, 'profile'));
});
}
notif = h('div.cp-notification', { notif = h('div.cp-notification', {
'data-hash': data.content.hash 'data-hash': data.content.hash
}, [h('div.cp-notification-content', h('p', formatData(data)))]); }, [
avatar,
h('div.cp-notification-content',
h('p', formatData(data)))
]);
if (typeof(data.content.getFormatText) === "function") { if (typeof(data.content.getFormatText) === "function") {
$(notif).find('.cp-notification-content p').html(data.content.getFormatText()); $(notif).find('.cp-notification-content p').html(data.content.getFormatText());

@ -83,6 +83,9 @@ define([
}; };
// UI // UI
window.CryptPad_UI = UI;
window.CryptPad_UIElements = UIElements;
window.CryptPad_common = funcs;
funcs.createUserAdminMenu = callWithCommon(UIElements.createUserAdminMenu); funcs.createUserAdminMenu = callWithCommon(UIElements.createUserAdminMenu);
funcs.initFilePicker = callWithCommon(UIElements.initFilePicker); funcs.initFilePicker = callWithCommon(UIElements.initFilePicker);
funcs.openFilePicker = callWithCommon(UIElements.openFilePicker); funcs.openFilePicker = callWithCommon(UIElements.openFilePicker);

@ -5,6 +5,7 @@ define([
'/common/common-util.js', '/common/common-util.js',
'/common/common-hash.js', '/common/common-hash.js',
'/common/common-interface.js', '/common/common-interface.js',
'/common/common-ui-elements.js',
'/common/common-feedback.js', '/common/common-feedback.js',
'/bower_components/nthen/index.js', '/bower_components/nthen/index.js',
'/common/sframe-common.js', '/common/sframe-common.js',
@ -22,6 +23,7 @@ define([
Util, Util,
Hash, Hash,
UI, UI,
UIElements,
Feedback, Feedback,
nThen, nThen,
SFCommon, SFCommon,
@ -272,13 +274,13 @@ define([
setEditable(false); setEditable(false);
if (drive.refresh) { drive.refresh(); } if (drive.refresh) { drive.refresh(); }
APP.toolbar.failed(); APP.toolbar.failed();
if (!noAlert) { UI.alert(Messages.common_connectionLost, undefined, true); } if (!noAlert) { UIElements.disconnectAlert(); }
}; };
var onReconnect = function () { var onReconnect = function () {
setEditable(true); setEditable(true);
if (drive.refresh) { drive.refresh(); } if (drive.refresh) { drive.refresh(); }
APP.toolbar.reconnecting(); APP.toolbar.reconnecting();
UI.findOKButton().click(); UIElements.reconnectAlert();
}; };
sframeChan.on('EV_DRIVE_LOG', function (msg) { sframeChan.on('EV_DRIVE_LOG', function (msg) {

@ -1,5 +1,6 @@
@import (reference) '../../customize/src/less2/include/framework.less'; @import (reference) '../../customize/src/less2/include/framework.less';
@import (reference) '../../customize/src/less2/include/sidebar-layout.less'; @import (reference) '../../customize/src/less2/include/sidebar-layout.less';
@import (reference) '../../customize/src/less2/include/avatar.less';
&.cp-app-notifications { &.cp-app-notifications {
@ -86,6 +87,14 @@
display: block; display: block;
} }
} }
.cp-avatar {
.avatar_main(48px);
padding: 0 10px;
cursor: pointer;
&:hover {
background-color: rgba(0,0,0,0.1);
}
}
&.cp-app-notification-archived { &.cp-app-notification-archived {
background-color: #f1f1f1; background-color: #f1f1f1;
} }

@ -741,7 +741,7 @@ define([
if (b64images.length && framework._.sfCommon.isLoggedIn()) { if (b64images.length && framework._.sfCommon.isLoggedIn()) {
var no = h('button.cp-corner-cancel', Messages.cancel); var no = h('button.cp-corner-cancel', Messages.cancel);
var yes = h('button.cp-corner-primary', Messages.ok); var yes = h('button.cp-corner-primary', Messages.ok);
var actions = h('div', [yes, no]); var actions = h('div', [no, yes]);
var modal = UI.cornerPopup(Messages.pad_base64, actions, '', {big: true}); var modal = UI.cornerPopup(Messages.pad_base64, actions, '', {big: true});
$(no).click(function () { $(no).click(function () {
modal.delete(); modal.delete();

@ -13,6 +13,7 @@ define([
'/common/sframe-common-codemirror.js', '/common/sframe-common-codemirror.js',
'/common/common-thumbnail.js', '/common/common-thumbnail.js',
'/common/common-interface.js', '/common/common-interface.js',
'/common/common-ui-elements.js',
'/common/hyperscript.js', '/common/hyperscript.js',
'/customize/messages.js', '/customize/messages.js',
'cm/lib/codemirror', 'cm/lib/codemirror',
@ -42,6 +43,7 @@ define([
SframeCM, SframeCM,
Thumb, Thumb,
UI, UI,
UIElements,
h, h,
Messages, Messages,
CMeditor, CMeditor,
@ -1098,13 +1100,13 @@ define([
}); });
} }
setEditable(false); setEditable(false);
//UI.alert(Messages.common_connectionLost, undefined, true); //UIElements.disconnectAlert();
}; };
var onReconnect = function () { var onReconnect = function () {
if (APP.unrecoverable) { return; } if (APP.unrecoverable) { return; }
setEditable(true); setEditable(true);
//UI.findOKButton().click(); //UIElements.reconnectAlert();
}; };
var getHeadingText = function () { var getHeadingText = function () {

@ -570,6 +570,29 @@ define([
return; return;
} }
if (!common.isLoggedIn()) {
var login = h('button.cp-corner-primary', Messages.login_login);
var register = h('button.cp-corner-primary', Messages.login_register);
var cancel = h('button.cp-corner-cancel', Messages.cancel);
var actions = h('div', [cancel, register, login]);
var modal = UI.cornerPopup(Messages.profile_login || "You need to log in to add this user to your contacts", actions, '', {alt: true}); // XXX
$(register).click(function () {
common.setLoginRedirect(function () {
common.gotoURL('/register/');
});
modal.delete();
});
$(login).click(function () {
common.setLoginRedirect(function () {
common.gotoURL('/login/');
});
modal.delete();
});
$(cancel).click(function () {
modal.delete();
});
}
var listmapConfig = { var listmapConfig = {
data: {}, data: {},
common: common, common: common,

@ -138,6 +138,7 @@
padding: 5px; padding: 5px;
padding-left: 15px; padding-left: 15px;
&[type="number"] { &[type="number"] {
height: @variables_input-height + 2px; // to avoid cropped numbers
border-right: 1px solid #adadad; border-right: 1px solid #adadad;
} }
&[type="checkbox"] { &[type="checkbox"] {

@ -1379,13 +1379,13 @@ define([
setEditable(false); setEditable(false);
if (APP.team && driveAPP.refresh) { driveAPP.refresh(); } if (APP.team && driveAPP.refresh) { driveAPP.refresh(); }
toolbar.failed(); toolbar.failed();
if (!noAlert) { UI.alert(Messages.common_connectionLost, undefined, true); } if (!noAlert) { UIElements.disconnectAlert(); }
}; };
var onReconnect = function () { var onReconnect = function () {
setEditable(true); setEditable(true);
if (APP.team && driveAPP.refresh) { driveAPP.refresh(); } if (APP.team && driveAPP.refresh) { driveAPP.refresh(); }
toolbar.reconnecting(); toolbar.reconnecting();
UI.findOKButton().click(); UIElements.reconnectAlert();
}; };
sframeChan.on('EV_DRIVE_LOG', function (msg) { sframeChan.on('EV_DRIVE_LOG', function (msg) {

Loading…
Cancel
Save