From afd20a3d51a7ecf61a953d30631276ab1c688ad4 Mon Sep 17 00:00:00 2001 From: Brian Nickel Date: Tue, 17 Jul 2012 08:10:06 -0700 Subject: [PATCH 1/2] Corrected parameters of `load` success callback to match docs and jQuery. Fixes issue #545. --- src/ajax.js | 2 +- test/ajax.html | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index ec754c6e4..52867dfa2 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -250,7 +250,7 @@ self.html(selector ? $(document.createElement('div')).html(response.replace(rscript, "")).find(selector).html() : response) - success && success.call(self) + success && success.apply(self, arguments) }) return this } diff --git a/test/ajax.html b/test/ajax.html index 6d4c01448..2ed16cb9f 100644 --- a/test/ajax.html +++ b/test/ajax.html @@ -163,12 +163,15 @@

Zepto Ajax unit tests

testAjaxLoad: function(t) { var testEl = $('#ajax_load') t.pause() - var el = testEl.load('fixtures/ajax_load_simple.html', function(){ + var el = testEl.load('fixtures/ajax_load_simple.html', function(response, status, xhr){ var that = this deferredResume(t, function(){ this.assertIdentical(testEl, that) this.assertEqual('simple ajax load', testEl.html().trim()) + this.assert(response) + this.assertEqual('success', status) }) + t.assertIn('abort', xhr) }) t.assertIdentical(testEl, el) }, From 96060b12d8cdceee1eb6c29c279f087a3867572d Mon Sep 17 00:00:00 2001 From: Brian Nickel Date: Tue, 17 Jul 2012 08:15:00 -0700 Subject: [PATCH 2/2] Fixed spacing. --- test/ajax.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ajax.html b/test/ajax.html index 2ed16cb9f..ef527a536 100644 --- a/test/ajax.html +++ b/test/ajax.html @@ -168,10 +168,10 @@

Zepto Ajax unit tests

deferredResume(t, function(){ this.assertIdentical(testEl, that) this.assertEqual('simple ajax load', testEl.html().trim()) - this.assert(response) - this.assertEqual('success', status) + this.assert(response) + this.assertEqual('success', status) }) - t.assertIn('abort', xhr) + t.assertIn('abort', xhr) }) t.assertIdentical(testEl, el) },