aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Hitchman2013-08-06 11:25:44 +1000
committerIgor Minar2013-08-08 23:29:59 -0700
commitf80730f497cb1ecb78a814f01df79b69223ad633 (patch)
tree200a2351efceca5466f49631481ff5771cbabf5b
parent43997c15406d0401525f3d2d72914b28850905e1 (diff)
downloadangular.js-f80730f497cb1ecb78a814f01df79b69223ad633.tar.bz2
fix(angular.copy): change angular.copy to correcly clone RegExp
angular.copy previously copied RegExp as an empty object. Change detects RegExp instance and clones into new RegExp. This change is based on a previous fix to allow Date to be copied. Closes #3473 Closes #3474
-rw-r--r--src/Angular.js2
-rw-r--r--test/AngularSpec.js23
2 files changed, 25 insertions, 0 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 0252a720..1a90f8bc 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -611,6 +611,8 @@ function copy(source, destination){
destination = copy(source, []);
} else if (isDate(source)) {
destination = new Date(source.getTime());
+ } else if (isRegExp(source)) {
+ destination = new RegExp(source.source);
} else if (isObject(source)) {
destination = copy(source, {});
}
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index a58b8109..56fc985c 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -31,6 +31,29 @@ describe('angular', function() {
expect(copy(date) === date).toBeFalsy();
});
+ it("should copy RegExp", function() {
+ var re = new RegExp(".*");
+ expect(copy(re) instanceof RegExp).toBeTruthy();
+ expect(copy(re).source).toBe(".*");
+ expect(copy(re) === re).toBe(false);
+ });
+
+ it("should copy literal RegExp", function() {
+ var re = /.*/;
+ expect(copy(re) instanceof RegExp).toBeTruthy();
+ expect(copy(re).source).toEqual(".*");
+ expect(copy(re) === re).toBeFalsy();
+ });
+
+ it("should deeply copy literal RegExp", function() {
+ var objWithRegExp = {
+ re: /.*/
+ };
+ expect(copy(objWithRegExp).re instanceof RegExp).toBeTruthy();
+ expect(copy(objWithRegExp).re.source).toEqual(".*");
+ expect(copy(objWithRegExp.re) === objWithRegExp.re).toBeFalsy();
+ });
+
it("should deeply copy an array into an existing array", function() {
var src = [1, {name:"value"}];
var dst = [{key:"v"}];