@@ -64,7 +64,7 @@ Rollcall.Client.prototype = {
64
64
} ,
65
65
66
66
67
- createSession : function ( account , callback ) {
67
+ createSession : function ( account , successCallback , errorCallback ) {
68
68
login = account . login
69
69
password = account . password
70
70
url = this . url + '/sessions.json'
@@ -76,109 +76,109 @@ Rollcall.Client.prototype = {
76
76
}
77
77
}
78
78
79
- callbackWrapper = function ( data ) {
80
- callback ( data [ 'session' ] )
79
+ successCallbackWrapper = function ( data ) {
80
+ successCallback ( data [ 'session' ] )
81
81
}
82
82
83
- this . request ( url , 'POST' , data , callbackWrapper )
83
+ this . request ( url , 'POST' , data , successCallbackWrapper , errorCallback )
84
84
} ,
85
85
86
86
// Creates a session for a group composed of the given members.
87
87
// If the group doesn't yet exist, it is created automatically.
88
- createGroupSession : function ( accounts , callback ) {
88
+ createGroupSession : function ( accounts , successCallback , errorCallback ) {
89
89
url = this . url + '/sessions/group.json'
90
90
91
91
data = {
92
92
logins : accounts ,
93
93
run_id : Sail . app . run . id
94
94
}
95
95
96
- callbackWrapper = function ( data ) {
97
- callback ( data [ 'session' ] )
96
+ successCallbackWrapper = function ( data ) {
97
+ successCallback ( data [ 'session' ] )
98
98
}
99
99
100
- this . request ( url , 'POST' , data , callbackWrapper )
100
+ this . request ( url , 'POST' , data , successCallbackWrapper , errorCallback )
101
101
} ,
102
102
103
103
104
- destroySessionForToken : function ( token , callback ) {
104
+ destroySessionForToken : function ( token , successCallback , errorCallback ) {
105
105
rollcall = this
106
106
107
107
url = rollcall . url + '/sessions/invalidate_token.json'
108
108
109
- this . request ( url , 'DELETE' , { token : token } , callback )
109
+ this . request ( url , 'DELETE' , { token : token } , successCallback , errorCallback )
110
110
} ,
111
111
112
112
113
113
/**
114
114
* Fetch session data for the given token.
115
115
* 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.
117
117
*/
118
- fetchSessionForToken : function ( token , callback , errorCallback ) {
118
+ fetchSessionForToken : function ( token , successCallback , errorCallback ) {
119
119
url = this . url + '/sessions/validate_token.json'
120
120
121
- this . request ( url , 'GET' , { token : token } , callback , errorCallback )
121
+ this . request ( url , 'GET' , { token : token } , successCallback , errorCallback )
122
122
} ,
123
123
124
124
/**
125
125
* Fetch the list of users.
126
126
*/
127
- fetchUsers : function ( options , callback ) {
127
+ fetchUsers : function ( options , successCallback , errorCallback ) {
128
128
url = this . url + '/users.json'
129
129
130
- this . request ( url , 'GET' , options , callback )
130
+ this . request ( url , 'GET' , options , successCallback , errorCallback )
131
131
} ,
132
132
133
133
/**
134
134
* Fetch the list of runs.
135
135
*/
136
- fetchRuns : function ( options , callback ) {
136
+ fetchRuns : function ( options , successCallback , errorCallback ) {
137
137
if ( options . curnit ) {
138
138
url = this . url + '/curnits/' + options . curnit + '/runs.json'
139
139
} else {
140
140
url = this . url + '/runs.json'
141
141
}
142
142
143
- this . request ( url , 'GET' , options , callback )
143
+ this . request ( url , 'GET' , options , successCallback , errorCallback )
144
144
} ,
145
145
146
146
/**
147
147
* Fetch run data for a run id or name.
148
148
*/
149
- fetchRun : function ( id , callback ) {
149
+ fetchRun : function ( id , successCallback , errorCallback ) {
150
150
url = this . url + '/runs/' + id + '.json'
151
151
152
- this . request ( url , 'GET' , { } , callback )
152
+ this . request ( url , 'GET' , { } , successCallback , errorCallback )
153
153
} ,
154
154
155
- fetchGroup : function ( login , callback ) {
155
+ fetchGroup : function ( login , successCallback , errorCallback ) {
156
156
url = this . url + '/groups/' + login + '.json'
157
157
158
- this . request ( url , 'GET' , { } , callback )
158
+ this . request ( url , 'GET' , { } , successCallback , errorCallback )
159
159
} ,
160
160
161
161
error : function ( error ) {
162
162
alert ( error . responseText )
163
163
} ,
164
164
165
- request : function ( url , method , params , callback , errorCallback ) {
165
+ request : function ( url , method , params , successCallback , errorCallback ) {
166
166
if ( this . canUseREST ( ) ) {
167
- this . requestUsingREST ( url , method , params , callback , errorCallback )
167
+ this . requestUsingREST ( url , method , params , successCallback , errorCallback )
168
168
} else {
169
- this . requestUsingJSONP ( url , method , params , callback , errorCallback )
169
+ this . requestUsingJSONP ( url , method , params , successCallback , errorCallback )
170
170
}
171
171
} ,
172
172
173
- requestUsingREST : function ( url , method , params , callback , errorCallback ) {
173
+ requestUsingREST : function ( url , method , params , successCallback , errorCallback ) {
174
174
rollcall = this
175
175
176
176
$ . ajax ( {
177
177
url : url ,
178
178
type : method ,
179
179
dataType : 'json' ,
180
180
data : params ,
181
- success : callback ,
181
+ success : successCallback ,
182
182
error : function ( error ) {
183
183
console . error ( "Error response from Rollcall at " + rollcall . url + ":" , error )
184
184
if ( errorCallback )
@@ -189,7 +189,7 @@ Rollcall.Client.prototype = {
189
189
} )
190
190
} ,
191
191
192
- requestUsingJSONP : function ( url , method , params , callback , errorCallback ) {
192
+ requestUsingJSONP : function ( url , method , params , successCallback , errorCallback ) {
193
193
rollcall = this
194
194
195
195
params [ '_method' ] = method
@@ -202,7 +202,7 @@ Rollcall.Client.prototype = {
202
202
else
203
203
rollcall . error ( data . error . data )
204
204
} else {
205
- callback ( data )
205
+ successCallback ( data )
206
206
}
207
207
}
208
208
0 commit comments