suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap ajax callbacks in Ember.run

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-07-31 13:52:08 +02:00
parent c0cb223aeb
commit 1951752f47
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/scripts/app/models/log.coffee
View File

@ -45,7 +45,7 @@ Travis.Log.Request = Em.Object.extend
Travis.ajax.ajax "/jobs/#{@id}/log?cors_hax=true", 'GET', Travis.ajax.ajax "/jobs/#{@id}/log?cors_hax=true", 'GET',
dataType: 'text' dataType: 'text'
headers: @HEADERS headers: @HEADERS
success: (body, status, xhr) => @handle(body, status, xhr) success: (body, status, xhr) => Ember.run(this, -> @handle(body, status, xhr))
handle: (body, status, xhr) -> handle: (body, status, xhr) ->
if xhr.status == 204 if xhr.status == 204

24
assets/scripts/lib/travis/ajax.coffee
View File

@ -58,10 +58,30 @@ Travis.ajax = Em.Object.create
options = $.extend(options, Travis.ajax.DEFAULT_OPTIONS) options = $.extend(options, Travis.ajax.DEFAULT_OPTIONS)
if Travis.testing if testMode?
console.log('RUnning ajax with', options.url)
# we use jquery.mockjax for test, I don't want to hack it or rewrite it, # we use jquery.mockjax for test, I don't want to hack it or rewrite it,
# so let's just pretend we still use ajax if testing mode is on # so let's just pretend we still use ajax if testing mode is on
return $.ajax(options) return new Ember.RSVP.Promise( (resolve, reject) ->
oldSuccess = options.success
options.success = (json, status, xhr) ->
Ember.run this, ->
oldSuccess.call(this, json, status, xhr)
Ember.run(null, resolve, json)
oldError = options.error
options.error = (jqXHR) ->
if jqXHR
# for a context, please see https://github.com/emberjs/ember.js/issues/3051
jqXHR.then = null
Ember.run this, ->
oldError.call this, jqXHR
reject(jqXHR)
$.ajax(options)
)
if options.data && (method == "GET" || method == "HEAD") if options.data && (method == "GET" || method == "HEAD")
params = jQuery.param(options.data) params = jQuery.param(options.data)