Skip to content

Commit e9996ac

Browse files
committed
added errorCallback parameter to all request methods
1 parent 66bb6c0 commit e9996ac

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

rollcall.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Rollcall.Client.prototype = {
6464
},
6565

6666

67-
createSession: function(account, callback) {
67+
createSession: function(account, successCallback, errorCallback) {
6868
login = account.login
6969
password = account.password
7070
url = this.url + '/sessions.json'
@@ -76,109 +76,109 @@ Rollcall.Client.prototype = {
7676
}
7777
}
7878

79-
callbackWrapper = function(data) {
80-
callback(data['session'])
79+
successCallbackWrapper = function(data) {
80+
successCallback(data['session'])
8181
}
8282

83-
this.request(url, 'POST', data, callbackWrapper)
83+
this.request(url, 'POST', data, successCallbackWrapper, errorCallback)
8484
},
8585

8686
// Creates a session for a group composed of the given members.
8787
// If the group doesn't yet exist, it is created automatically.
88-
createGroupSession: function(accounts, callback) {
88+
createGroupSession: function(accounts, successCallback, errorCallback) {
8989
url = this.url + '/sessions/group.json'
9090

9191
data = {
9292
logins: accounts,
9393
run_id: Sail.app.run.id
9494
}
9595

96-
callbackWrapper = function(data) {
97-
callback(data['session'])
96+
successCallbackWrapper = function(data) {
97+
successCallback(data['session'])
9898
}
9999

100-
this.request(url, 'POST', data, callbackWrapper)
100+
this.request(url, 'POST', data, successCallbackWrapper, errorCallback)
101101
},
102102

103103

104-
destroySessionForToken: function(token, callback) {
104+
destroySessionForToken: function(token, successCallback, errorCallback) {
105105
rollcall = this
106106

107107
url = rollcall.url + '/sessions/invalidate_token.json'
108108

109-
this.request(url, 'DELETE', {token: token}, callback)
109+
this.request(url, 'DELETE', {token: token}, successCallback, errorCallback)
110110
},
111111

112112

113113
/**
114114
* Fetch session data for the given token.
115115
* If the session data is retrieved successfully, then given
116-
* callback is executed with the session data.
116+
* callbacks are executed with the session data.
117117
*/
118-
fetchSessionForToken: function(token, callback, errorCallback) {
118+
fetchSessionForToken: function(token, successCallback, errorCallback) {
119119
url = this.url + '/sessions/validate_token.json'
120120

121-
this.request(url, 'GET', {token: token}, callback, errorCallback)
121+
this.request(url, 'GET', {token: token}, successCallback, errorCallback)
122122
},
123123

124124
/**
125125
* Fetch the list of users.
126126
*/
127-
fetchUsers: function(options, callback) {
127+
fetchUsers: function(options, successCallback, errorCallback) {
128128
url = this.url + '/users.json'
129129

130-
this.request(url, 'GET', options, callback)
130+
this.request(url, 'GET', options, successCallback, errorCallback)
131131
},
132132

133133
/**
134134
* Fetch the list of runs.
135135
*/
136-
fetchRuns: function(options, callback) {
136+
fetchRuns: function(options, successCallback, errorCallback) {
137137
if (options.curnit) {
138138
url = this.url + '/curnits/'+options.curnit+'/runs.json'
139139
} else {
140140
url = this.url + '/runs.json'
141141
}
142142

143-
this.request(url, 'GET', options, callback)
143+
this.request(url, 'GET', options, successCallback, errorCallback)
144144
},
145145

146146
/**
147147
* Fetch run data for a run id or name.
148148
*/
149-
fetchRun: function(id, callback) {
149+
fetchRun: function(id, successCallback, errorCallback) {
150150
url = this.url + '/runs/'+id+'.json'
151151

152-
this.request(url, 'GET', {}, callback)
152+
this.request(url, 'GET', {}, successCallback, errorCallback)
153153
},
154154

155-
fetchGroup: function(login, callback) {
155+
fetchGroup: function(login, successCallback, errorCallback) {
156156
url = this.url + '/groups/'+login+'.json'
157157

158-
this.request(url, 'GET', {}, callback)
158+
this.request(url, 'GET', {}, successCallback, errorCallback)
159159
},
160160

161161
error: function(error) {
162162
alert(error.responseText)
163163
},
164164

165-
request: function(url, method, params, callback, errorCallback) {
165+
request: function(url, method, params, successCallback, errorCallback) {
166166
if (this.canUseREST()) {
167-
this.requestUsingREST(url, method, params, callback, errorCallback)
167+
this.requestUsingREST(url, method, params, successCallback, errorCallback)
168168
} else {
169-
this.requestUsingJSONP(url, method, params, callback, errorCallback)
169+
this.requestUsingJSONP(url, method, params, successCallback, errorCallback)
170170
}
171171
},
172172

173-
requestUsingREST: function(url, method, params, callback, errorCallback) {
173+
requestUsingREST: function(url, method, params, successCallback, errorCallback) {
174174
rollcall = this
175175

176176
$.ajax({
177177
url: url,
178178
type: method,
179179
dataType: 'json',
180180
data: params,
181-
success: callback,
181+
success: successCallback,
182182
error: function(error) {
183183
console.error("Error response from Rollcall at " + rollcall.url + ":", error)
184184
if (errorCallback)
@@ -189,7 +189,7 @@ Rollcall.Client.prototype = {
189189
})
190190
},
191191

192-
requestUsingJSONP: function(url, method, params, callback, errorCallback) {
192+
requestUsingJSONP: function(url, method, params, successCallback, errorCallback) {
193193
rollcall = this
194194

195195
params['_method'] = method
@@ -202,7 +202,7 @@ Rollcall.Client.prototype = {
202202
else
203203
rollcall.error(data.error.data)
204204
} else {
205-
callback(data)
205+
successCallback(data)
206206
}
207207
}
208208

0 commit comments

Comments
 (0)