Skip to content

Commit de1c280

Browse files
committed
release v2.0.1
1 parent ac3e7b9 commit de1c280

File tree

7 files changed

+29
-10
lines changed

7 files changed

+29
-10
lines changed

Diff for: CHANGELOG

+7
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1+
v2.0.1
2+
Thu, 12 Jun 2014 05:19:23 GMT
3+
4+
0e83953 [changed] don’t require textStatus
5+
46440df [fixed] let jqXHR object survive the fixture copy
6+
7+
18

Diff for: bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ic-ajax",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"authors": [
55
"Ryan Florence <[email protected]>"
66
],

Diff for: dist/amd/main.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ define(
5656
*/
5757

5858
function defineFixture(url, fixture) {
59-
__fixtures__[url] = JSON.parse(JSON.stringify(fixture));
59+
if (fixture.response) {
60+
fixture.response = JSON.parse(JSON.stringify(fixture.response));
61+
}
62+
__fixtures__[url] = fixture;
6063
}
6164

6265
__exports__.defineFixture = defineFixture;/*
@@ -73,7 +76,7 @@ define(
7376
return new Ember.RSVP.Promise(function(resolve, reject) {
7477
var fixture = lookupFixture(settings.url);
7578
if (fixture) {
76-
if (fixture.textStatus === 'success') {
79+
if (fixture.textStatus === 'success' || fixture.textStatus == null) {
7780
return Ember.run(null, resolve, fixture);
7881
} else {
7982
return Ember.run(null, reject, fixture);

Diff for: dist/cjs/main.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ exports.__fixtures__ = __fixtures__;
5353
*/
5454

5555
function defineFixture(url, fixture) {
56-
__fixtures__[url] = JSON.parse(JSON.stringify(fixture));
56+
if (fixture.response) {
57+
fixture.response = JSON.parse(JSON.stringify(fixture.response));
58+
}
59+
__fixtures__[url] = fixture;
5760
}
5861

5962
exports.defineFixture = defineFixture;/*
@@ -70,7 +73,7 @@ exports.lookupFixture = lookupFixture;function makePromise(settings) {
7073
return new Ember.RSVP.Promise(function(resolve, reject) {
7174
var fixture = lookupFixture(settings.url);
7275
if (fixture) {
73-
if (fixture.textStatus === 'success') {
76+
if (fixture.textStatus === 'success' || fixture.textStatus == null) {
7477
return Ember.run(null, resolve, fixture);
7578
} else {
7679
return Ember.run(null, reject, fixture);

Diff for: dist/globals/main.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ exports.__fixtures__ = __fixtures__;
5454
*/
5555

5656
function defineFixture(url, fixture) {
57-
__fixtures__[url] = JSON.parse(JSON.stringify(fixture));
57+
if (fixture.response) {
58+
fixture.response = JSON.parse(JSON.stringify(fixture.response));
59+
}
60+
__fixtures__[url] = fixture;
5861
}
5962

6063
exports.defineFixture = defineFixture;/*
@@ -71,7 +74,7 @@ exports.lookupFixture = lookupFixture;function makePromise(settings) {
7174
return new Ember.RSVP.Promise(function(resolve, reject) {
7275
var fixture = lookupFixture(settings.url);
7376
if (fixture) {
74-
if (fixture.textStatus === 'success') {
77+
if (fixture.textStatus === 'success' || fixture.textStatus == null) {
7578
return Ember.run(null, resolve, fixture);
7679
} else {
7780
return Ember.run(null, reject, fixture);

Diff for: dist/named-amd/main.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ define("ic-ajax",
5656
*/
5757

5858
function defineFixture(url, fixture) {
59-
__fixtures__[url] = JSON.parse(JSON.stringify(fixture));
59+
if (fixture.response) {
60+
fixture.response = JSON.parse(JSON.stringify(fixture.response));
61+
}
62+
__fixtures__[url] = fixture;
6063
}
6164

6265
__exports__.defineFixture = defineFixture;/*
@@ -73,7 +76,7 @@ define("ic-ajax",
7376
return new Ember.RSVP.Promise(function(resolve, reject) {
7477
var fixture = lookupFixture(settings.url);
7578
if (fixture) {
76-
if (fixture.textStatus === 'success') {
79+
if (fixture.textStatus === 'success' || fixture.textStatus == null) {
7780
return Ember.run(null, resolve, fixture);
7881
} else {
7982
return Ember.run(null, reject, fixture);

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ic-ajax",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "ember friendly $.ajax wrapper",
55
"main": "dist/cjs/main.js",
66
"devDependencies": {

0 commit comments

Comments
 (0)