kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-12 22:35:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

dissabled a lot of tests, and made the core test set pass.

Browse Source
This commit is contained in:
Misko Hevery
2010-03-29 20:25:42 -07:00
parent c655b884e2
commit e55c97deba
26 changed files with 820 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Resource.js
View File

@@ -46,11 +46,11 @@ ResourceFactory.prototype = {
route: function(url, paramDefaults, actions){
var self = this;
var route = new Route(url);
actions = $.extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
actions = extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
function extractParams(data){
var ids = {};
foreach(paramDefaults || {}, function(value, key){
ids[key] = value.charAt && value.charAt(0) == '@' ? Scope.getter(data, value.substr(1)) : value;
ids[key] = value.charAt && value.charAt(0) == '@' ? getter(data, value.substr(1)) : value;
});
return ids;
}
@@ -83,7 +83,7 @@ ResourceFactory.prototype = {
}
var value = action.isArray ? [] : new Resource(data);
self.xhr(action.method, route.url($.extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
self.xhr(action.method, route.url(extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
if (action.isArray) {
foreach(response, function(item){
value.push(new Resource(item));
@@ -97,7 +97,7 @@ ResourceFactory.prototype = {
};
Resource.bind = function(additionalParamDefaults){
return self.route(url, $.extend({}, paramDefaults, additionalParamDefaults), actions);
return self.route(url, extend({}, paramDefaults, additionalParamDefaults), actions);
};
if (!isGet) {