api.request helper function

One function for all the jquery specific request handling.

Signed-off-by: Azul <azul@riseup.net>

4 files changed, 41 insertions, 121 deletions

diff --git a/js/circles.v1.circles.js b/js/circles.v1.circles.js
index c2386831..2dc64a97 100644
--- a/js/circles.v1.circles.js
+++ b/js/circles.v1.circles.js
@@ -29,26 +29,19 @@
 var circles = {
 
 	createCircle: function (type, name, callback) {
-
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'PUT',
 			url: OC.generateUrl('/apps/circles/v1/circles'),
 			data: {
 				type: type,
 				name: name
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	listCircles: function (type, name, level, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'GET',
 			url: OC.generateUrl('/apps/circles/v1/circles'),
 			data: {
@@ -56,80 +49,51 @@ var circles = {
 				name: name,
 				level: level
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	detailsCircle: function (circleId, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'GET',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId)
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	joinCircle: function (circleId, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'GET',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/join'),
 			data: {}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	settingsCircle: function (circleId, settings, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'POST',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/settings'),
 			data: {settings: settings}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	leaveCircle: function (circleId, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'GET',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/leave'),
 			data: {}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	destroyCircle: function (circleId, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'DELETE',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId),
 			data: {}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	}
 
 };
diff --git a/js/circles.v1.js b/js/circles.v1.js
index b5a64538..cc0eb48a 100644
--- a/js/circles.v1.js
+++ b/js/circles.v1.js
@@ -50,8 +50,7 @@
 
 
 			this.shareToCircle = function (circleId, source, type, item, callback) {
-				var result = {status: -1};
-				$.ajax({
+				self.request({
 					method: 'PUT',
 					url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/share'),
 					data: {
@@ -59,11 +58,14 @@
 						type: type,
 						item: item
 					}
-				}).done(function (res) {
-					self.onCallback(callback, res);
-				}).fail(function () {
-					self.onCallback(callback, result);
-				});
+				}, callback)
+			};
+
+			this.request = function (options, callback) {
+				var result = {status: -1};
+				$.ajax(options)
+					.done(function (res) { self.onCallback(callback, res); })
+					.fail(function () { self.onCallback(callback, result); });
 			};
 
 			this.onCallback = function (callback, result) {
diff --git a/js/circles.v1.links.js b/js/circles.v1.links.js
index ca927f2f..5d14288f 100644
--- a/js/circles.v1.links.js
+++ b/js/circles.v1.links.js
@@ -30,83 +30,58 @@
 var links = {
 
 	linkCircle: function (circleId, remote, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'POST',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/link'),
 			data: {
 				remote: remote
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	linkStatus: function (linkId, status, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'POST',
 			url: OC.generateUrl('/apps/circles/v1/link/' + linkId + '/status'),
 			data: {
 				status: status
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	linkGroup: function (circleId, groupId, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'PUT',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/groups'),
 			data: {
 				name: groupId
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	unlinkGroup: function (circleId, groupId, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'DELETE',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/groups'),
 			data: {
 				group: groupId
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	levelGroup: function (circleId, group, level, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'POST',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/group/level'),
 			data: {
 				group: group,
 				level: level
 			}
-		}).done(function (res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function () {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	}
 
 };
diff --git a/js/circles.v1.members.js b/js/circles.v1.members.js
index 6979be0e..050a375b 100644
--- a/js/circles.v1.members.js
+++ b/js/circles.v1.members.js
@@ -29,25 +29,18 @@
 var members = {
 
 	searchUsers: function(search, callback) {
-
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'GET',
 			url: OC.generateUrl('/apps/circles/v1/globalsearch'),
 			data: {
 				search: search
 			}
-		}).done(function(res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function() {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	addMember: function(circleId, ident, type, instance, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'PUT',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/member'),
 			data: {
@@ -55,17 +48,12 @@ var members = {
 				type: type,
 				instance: instance
 			}
-		}).done(function(res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function() {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	removeMember: function(circleId, userId, userType, instance, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'DELETE',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/member'),
 			data: {
@@ -73,17 +61,12 @@ var members = {
 				type: Number(userType),
 				instance: instance
 			}
-		}).done(function(res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function() {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	},
 
 
 	levelMember: function(circleId, userId, userType, instance, level, callback) {
-		var result = {status: -1};
-		$.ajax({
+		OCA.Circles.api.request({
 			method: 'POST',
 			url: OC.generateUrl('/apps/circles/v1/circles/' + circleId + '/level'),
 			data: {
@@ -92,11 +75,7 @@ var members = {
 				instance: instance,
 				level: level
 			}
-		}).done(function(res) {
-			OCA.Circles.api.onCallback(callback, res);
-		}).fail(function() {
-			OCA.Circles.api.onCallback(callback, result);
-		});
+		}, callback);
 	}