Skip to content

Commit 01f9ee7

Browse files
committed
Done basic implementation of patch
1 parent 84cd9f4 commit 01f9ee7

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/protocol/patch.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,25 @@ dop.protocol.patch = function(node, object_id, patch) {
1616
};
1717

1818
dop.protocol.onpatch = function(node, request_id, request) {
19-
var object_id = request[1],
19+
var object_id_owner = request[1],
20+
object_id = node.owner[object_id_owner],
2021
version = request[2],
2122
patch = request[3],
2223
response = dop.core.createResponse(request_id),
2324
object_data = dop.data.object[object_id],
2425
object_node;
2526

26-
if (isObject(object_data) && isObject(object_data.node[node.token]) && object_data.node[node.token].owner===object_id) {
27+
if (isObject(object_data) && isObject(object_data.node[node.token]) && object_data.node[node.token].owner===object_id_owner) {
2728
object_node = object_data.node[node.token];
29+
// We apply patch
2830
if (object_node.owner_version+1 === version) {
29-
// We apply patch
3031
object_node.owner_version += 1;
3132
collector = dop.collectFirst();
3233
dop.core.setActionFunction(object_data.object, patch);
3334
collector.emitAndDestroy();
3435
response.push(0);
3536
}
37+
//
3638
}
3739
else
3840
response.push(dop.core.error.reject_remote.OBJECT_NOT_FOUND);
@@ -42,10 +44,13 @@ dop.protocol.onpatch = function(node, request_id, request) {
4244

4345
dop.protocol._onpatch = function(node, request_id, request, response) {
4446
var rejection = response[0],
47+
// object_id = request[2],
4548
promise = request.promise;
49+
50+
4651
if (rejection !== undefined) {
4752
if (rejection === 0) {
48-
53+
// var object_node = dop.data.object[object_id].node[node.token];
4954
promise.resolve(response[1]);
5055
}
5156
else

0 commit comments

Comments
 (0)