Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uses the method from ajaxSettings instead of passed in #424

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Uses the method from ajaxSettings instead of passed in #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ddd6475
Uses the method from ajaxSettings instead of passed in
May 24, 2015
904b9c5
ran grunt build to update ember-model.js
May 24, 2015
e07f533
Allows you to specify your own success/error callback in ajaxSettings
c0achmcguirk May 25, 2015
f346722
allows for x-url-encoded parameters on POST submission
c0achmcguirk May 26, 2015
8619189
Gives you the ability to override both dataType and contentType
Jun 3, 2015
fa02e94
Copies dist/ember-model.js to the root folder
Jun 3, 2015
1300b68
Uses new getter/setter for computed properties because deprecated
c0achmcguirk Jun 3, 2015
247860a
Compatibility with ember 1.13.0-beta.2
juggy Jun 3, 2015
b4b9926
update release
juggy Jun 3, 2015
708b7f6
Fixes vestigial tail from bad merge
Jun 3, 2015
095b585
Removes default contentType from ajaxSettings
Jun 3, 2015
6b0a69e
Merge remote-tracking branch 'ebryn/master'
Nov 20, 2015
d5a123b
runs grunt build to make sure ember-model is up to snuff
Nov 20, 2015
d4f73d8
Merge remote-tracking branch 'ebryn/master' into update
Apr 3, 2016
2d63621
fixed typo from bad merge
Apr 3, 2016
9c5302a
Reverting back to ember.merge because ember 2.2 doesn't support it
Apr 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions ember-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, {
load: function(id, hash) {
var data = {};
data[get(this.constructor, 'primaryKey')] = id;
set(this, '_data', Ember.assign(data, hash));
set(this, '_data', Ember.merge(data, hash));
this.getWithDefault('_dirtyAttributes', []).clear();

this._reloadHasManys();
Expand Down Expand Up @@ -1614,8 +1614,8 @@ Ember.Model.reopen({
(function() {

var get = Ember.get,
set = Ember.set,
meta = Ember.meta;
set = Ember.set,
meta = Ember.meta;

Ember.Model.dataTypes = {};

Expand Down Expand Up @@ -1836,9 +1836,9 @@ Ember.RESTAdapter = Ember.Adapter.extend({

ajaxSettings: function(url, method) {
return {
url: url,
type: method,
dataType: "json"
url : url,
type : method,
dataType : "json"
};
},

Expand All @@ -1850,16 +1850,22 @@ Ember.RESTAdapter = Ember.Adapter.extend({

return new Ember.RSVP.Promise(function(resolve, reject) {
if (params) {
if (method === "GET") {
if (/get/i.test(settings.type)) { // GET
settings.data = params;
} else {
settings.contentType = "application/json; charset=utf-8";
settings.data = JSON.stringify(params);
} else { // POST, PUT
if (/json/i.test(settings.contentType)) {
settings.data = JSON.stringify(params);
} else { // application/x-www-form-urlencoded; charset=UTF-8
settings.data = params;
}
}
}

settings.success = function(json) {
settings.success = function(json, textStatus, jqXHR) {
Ember.run(null, resolve, json);
if (settings.successCallback) {
settings.successCallback.call(this, json, textStatus, jqXHR);
}
};

settings.error = function(jqXHR, textStatus, errorThrown) {
Expand All @@ -1869,6 +1875,11 @@ Ember.RESTAdapter = Ember.Adapter.extend({
}

self._handleRejections(method, jqXHR, resolve, reject);


if (settings.errorCallback) {
settings.errorCallback.call(this, jqXHR, textStatus, errorThrown);
}
};


Expand Down Expand Up @@ -2077,7 +2088,7 @@ Ember.Model.Store = Ember.Object.extend({
createRecord: function(type, props) {
var klass = this.modelFor(type);
klass.reopenClass({adapter: this.adapterFor(type)});
return klass.create(Ember.assign({container: this.container}, props));
return klass.create(Ember.merge({container: this.container}, props));
},

find: function(type, id) {
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-model/lib/attr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require('ember-model/computed');
var get = Ember.get,
set = Ember.set,
meta = Ember.meta;
set = Ember.set,
meta = Ember.meta;

Ember.Model.dataTypes = {};

Expand Down
2 changes: 1 addition & 1 deletion packages/ember-model/lib/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, {
load: function(id, hash) {
var data = {};
data[get(this.constructor, 'primaryKey')] = id;
set(this, '_data', Ember.assign(data, hash));
set(this, '_data', Ember.merge(data, hash));
this.getWithDefault('_dirtyAttributes', []).clear();

this._reloadHasManys();
Expand Down
27 changes: 18 additions & 9 deletions packages/ember-model/lib/rest_adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ Ember.RESTAdapter = Ember.Adapter.extend({

ajaxSettings: function(url, method) {
return {
url: url,
type: method,
dataType: "json"
url : url,
type : method,
dataType : "json"
};
},

Expand All @@ -131,16 +131,22 @@ Ember.RESTAdapter = Ember.Adapter.extend({

return new Ember.RSVP.Promise(function(resolve, reject) {
if (params) {
if (method === "GET") {
if (/get/i.test(settings.type)) { // GET
settings.data = params;
} else {
settings.contentType = "application/json; charset=utf-8";
settings.data = JSON.stringify(params);
} else { // POST, PUT
if (/json/i.test(settings.contentType)) {
settings.data = JSON.stringify(params);
} else { // application/x-www-form-urlencoded; charset=UTF-8
settings.data = params;
}
}
}

settings.success = function(json) {
settings.success = function(json, textStatus, jqXHR) {
Ember.run(null, resolve, json);
if (settings.successCallback) {
settings.successCallback.call(this, json, textStatus, jqXHR);
}
};

settings.error = function(jqXHR, textStatus, errorThrown) {
Expand All @@ -150,8 +156,11 @@ Ember.RESTAdapter = Ember.Adapter.extend({
}

self._handleRejections(method, jqXHR, resolve, reject);
};

if (settings.errorCallback) {
settings.errorCallback.call(this, jqXHR, textStatus, errorThrown);
}
};

Ember.$.ajax(settings);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-model/lib/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Ember.Model.Store = Ember.Object.extend({
createRecord: function(type, props) {
var klass = this.modelFor(type);
klass.reopenClass({adapter: this.adapterFor(type)});
return klass.create(Ember.assign({container: this.container}, props));
return klass.create(Ember.merge({container: this.container}, props));
},

find: function(type, id) {
Expand Down