NB-Public/circles
14
0
Fork 0
mirror of https://github.com/netzbegruenung/circles.git synced 2024-05-01 19:34:51 +02:00
Code Issues Projects Releases Wiki Activity

fix: do not rely on api global

Browse source 
The api files relied on an api global to handle responses:

```javascript
$.ajax({ ...
}).done(function (res) {
	api.onCallback(callback, res);
}).fail(function () {
	api.onCallback(callback, result);
});
```

In the files app this only worked
because circles.files.app.js added api as a global.

Remove that global and replace it with
```javascript
OCA.Circles.api
```
wherever it was used.

Signed-off-by: Azul <azul@riseup.net>
This commit is contained in:
Azul 2020-07-07 16:09:39 +02:00
parent 0260a2bd6d
commit 54cafbe389
4 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
js/circles.v1.circles.js
View file

@ -39,9 +39,9 @@ var circles = {
name: name
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -57,9 +57,9 @@ var circles = {
level: level
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -70,9 +70,9 @@ var circles = {
method: 'GET',
url: OC.generateUrl('/apps/circles/v1/circles/' + circleId)
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -84,9 +84,9 @@ var circles = {
url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/join'),
data: {}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -98,9 +98,9 @@ var circles = {
url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/settings'),
data: {settings: settings}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -112,9 +112,9 @@ var circles = {
url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/leave'),
data: {}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -126,9 +126,9 @@ var circles = {
url: OC.generateUrl('/apps/circles/v1/circles/' + circleId),
data: {}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
}

21
js/circles.v1.links.js
View file

@ -29,7 +29,6 @@
var links = {
linkCircle: function (circleId, remote, callback) {
var result = {status: -1};
$.ajax({
@ -39,9 +38,9 @@ var links = {
remote: remote
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -55,9 +54,9 @@ var links = {
status: status
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -71,9 +70,9 @@ var links = {
name: groupId
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -87,9 +86,9 @@ var links = {
group: groupId
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -104,9 +103,9 @@ var links = {
level: level
}
}).done(function (res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function () {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
}

17
js/circles.v1.members.js
View file

@ -28,7 +28,6 @@
var members = {
searchUsers: function(search, callback) {
var result = {status: -1};
@ -39,9 +38,9 @@ var members = {
search: search
}
}).done(function(res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function() {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -57,9 +56,9 @@ var members = {
instance: instance
}
}).done(function(res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function() {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -75,9 +74,9 @@ var members = {
instance: instance
}
}).done(function(res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function() {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
},
@ -94,9 +93,9 @@ var members = {
level: level
}
}).done(function(res) {
api.onCallback(callback, res);
OCA.Circles.api.onCallback(callback, res);
}).fail(function() {
api.onCallback(callback, result);
OCA.Circles.api.onCallback(callback, result);
});
}

2
js/files/circles.files.app.js
View file

@ -11,8 +11,6 @@
*
*/
var api = OCA.Circles.api;
(function() {
if (!OCA.Circles) {
/**