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

merge staging

Browse Source
This commit is contained in:
ansuz
2018-06-28 13:33:54 +02:00
parent 01614c4256 76c9b01d45
commit 7aa7b82c60
19 changed files with 149 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/common/outer/async-store.js
View File

@@ -894,7 +894,7 @@ define([
};
Store.messenger = {
getFriendList: function (data, cb) {
getFriendList: function (clientId, data, cb) {
store.messenger.getFriendList(function (e, keys) {
cb({
error: e,
@@ -902,7 +902,7 @@ define([
});
});
},
getMyInfo: function (data, cb) {
getMyInfo: function (clientId, data, cb) {
store.messenger.getMyInfo(function (e, info) {
cb({
error: e,
@@ -910,7 +910,7 @@ define([
});
});
},
getFriendInfo: function (data, cb) {
getFriendInfo: function (clientId, data, cb) {
store.messenger.getFriendInfo(data, function (e, info) {
cb({
error: e,
@@ -918,7 +918,7 @@ define([
});
});
},
removeFriend: function (data, cb) {
removeFriend: function (clientId, data, cb) {
store.messenger.removeFriend(data, function (e, info) {
cb({
error: e,
@@ -926,12 +926,12 @@ define([
});
});
},
openFriendChannel: function (data, cb) {
openFriendChannel: function (clientId, data, cb) {
store.messenger.openFriendChannel(data, function (e) {
cb({ error: e, });
});
},
getFriendStatus: function (data, cb) {
getFriendStatus: function (clientId, data, cb) {
store.messenger.getStatus(data, function (e, online) {
cb({
error: e,
@@ -939,7 +939,7 @@ define([
});
});
},
getMoreHistory: function (data, cb) {
getMoreHistory: function (clientId, data, cb) {
store.messenger.getMoreHistory(data.curvePublic, data.sig, data.count, function (e, history) {
cb({
error: e,
@@ -947,14 +947,14 @@ define([
});
});
},
sendMessage: function (data, cb) {
sendMessage: function (clientId, data, cb) {
store.messenger.sendMessage(data.curvePublic, data.content, function (e) {
cb({
error: e,
});
});
},
setChannelHead: function (data, cb) {
setChannelHead: function (clientId, data, cb) {
store.messenger.setChannelHead(data.curvePublic, data.sig, function (e) {
cb({
error: e

4
www/common/outer/testworker.js Normal file
View File

@@ -0,0 +1,4 @@
if (!self.crypto && !self.msCrypto) {
throw new Error("E_NOCRYPTO");
}
self.postMessage("OK");

1
www/common/outer/userObject.js
View File

@@ -41,7 +41,6 @@ define([
if (!attr || !attr.trim()) { return void cb("E_INVAL_ATTR"); }
var data = exp.getFileData(id);
data[attr] = clone(value);
console.log(data);
cb(null);
};
exp.getPadAttribute = function (href, attr, cb) {