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

revert: chore($resource): Use shallow copy instead of angular.copy

Browse Source
This commit is contained in:
Matias Niemelä
2013-12-06 13:08:46 -05:00
parent acaac21fd1
commit 3602c9785b
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ngResource/resource.js
View File

@@ -24,25 +24,6 @@ function lookupDottedPath(obj, path) {
return obj; return obj;
} }
/**
* Create a shallow copy of an object and clear other fields from the destination
*/
function shallowClearAndCopy(src, dst) {
dst = dst || {};
angular.forEach(dst, function(value, key){
delete dst[key];
});
for (var key in src) {
if (src.hasOwnProperty(key) && key.substr(0, 2) !== '$$') {
dst[key] = src[key];
}
}
return dst;
}
/** /**
* @ngdoc overview * @ngdoc overview
* @name ngResource * @name ngResource
@@ -412,7 +393,7 @@ angular.module('ngResource', ['ng']).
} }
function Resource(value){ function Resource(value){
shallowClearAndCopy(value || {}, this); copy(value || {}, this);
} }
forEach(actions, function(action, name) { forEach(actions, function(action, name) {
@@ -484,7 +465,7 @@ angular.module('ngResource', ['ng']).
if (data) { if (data) {
// Need to convert action.isArray to boolean in case it is undefined // Need to convert action.isArray to boolean in case it is undefined
// jshint -W018 // jshint -W018
if (angular.isArray(data) !== (!!action.isArray)) { if ( angular.isArray(data) !== (!!action.isArray) ) {
throw $resourceMinErr('badcfg', 'Error in resource configuration. Expected ' + throw $resourceMinErr('badcfg', 'Error in resource configuration. Expected ' +
'response to contain an {0} but got an {1}', 'response to contain an {0} but got an {1}',
action.isArray?'array':'object', angular.isArray(data)?'array':'object'); action.isArray?'array':'object', angular.isArray(data)?'array':'object');
@@ -496,7 +477,7 @@ angular.module('ngResource', ['ng']).
value.push(new Resource(item)); value.push(new Resource(item));
}); });
} else { } else {
shallowClearAndCopy(data, value); copy(data, value);
value.$promise = promise; value.$promise = promise;
} }
} }