Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-stripe committed Jul 28, 2012
1 parent f5ddb70 commit 3540b1b
Showing 1 changed file with 20 additions and 8 deletions.
28 changes: 20 additions & 8 deletions src/ajax.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,36 @@ class Base
$.ajax @ajaxSettings(params, defaults)

ajaxQueue: (params, defaults) ->
jqXHR = undefined
jqXHR = null
deferred = $.Deferred()
promise = deferred.promise()

promise = deferred.promise()
return promise unless Ajax.enabled
settings = @ajaxSettings params, defaults

settings = @ajaxSettings(params, defaults)

request = (next) ->
jqXHR = $.ajax(settings).then(next, next).done(deferred.resolve).fail(deferred.reject)
jqXHR = $.ajax(settings)
.then(next, next)
.done(deferred.resolve)
.fail(deferred.reject)

promise.abort = (statusText) ->
return jqXHR.abort(statusText) if jqXHR
index = $.inArray request, @queue()
@queue().splice index, 1 if index > -1
deferred.rejectWith settings.context || settings, [promise, statusText, ""]
index = $.inArray(request, @queue())
@queue().splice(index, 1) if index > -1

deferred.rejectWith(
settings.context or settings,
[promise, statusText, '']
)
promise

@queue request
promise

ajaxSettings: (params, defaults) ->
$.extend {}, @defaults, defaults, params
$.extend({}, @defaults, defaults, params)

class Collection extends Base
constructor: (@model) ->
Expand Down

0 comments on commit 3540b1b

Please sign in to comment.