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

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

Browse Source
This commit is contained in:
ansuz 2017-08-28 17:52:01 +02:00
commit 288c03bb41
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/pad/links.js
View File

@ -29,7 +29,8 @@ define(['/common/cryptpad-common.js'], function (Cryptpad) {
if (anchor) { if (anchor) {
var href = anchor.getAttribute('href'); var href = anchor.getAttribute('href');
if (href) { if (href) {
window.open(href); var bounceHref = window.location.origin + '/bounce/#' + encodeURIComponent(href);
window.open(bounceHref);
} }
} }
} }

1
www/pad/main.js
View File

@ -176,6 +176,7 @@ define([
sframeChan.on('Q_SEND_FRIEND_REQUEST', function (netfluxId, cb) { sframeChan.on('Q_SEND_FRIEND_REQUEST', function (netfluxId, cb) {
Cryptpad.inviteFromUserlist(Cryptpad, netfluxId); Cryptpad.inviteFromUserlist(Cryptpad, netfluxId);
cb();
}); });
Cryptpad.onFriendRequest = function (confirmText, cb) { Cryptpad.onFriendRequest = function (confirmText, cb) {
sframeChan.query('Q_INCOMING_FRIEND_REQUEST', confirmText, function (err, data) { sframeChan.query('Q_INCOMING_FRIEND_REQUEST', confirmText, function (err, data) {