fix(injector) .instantiate([Type]) produced wrong result

angular · Feb 16, 2012 · eb92735 · eb92735
1 parent 7767392
commit eb92735
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Injector.js b/src/Injector.js
@@ -433,7 +433,7 @@ function createInjector(modulesToLoad) {
       var Constructor = function() {},
           instance, returnedValue;
 
-      Constructor.prototype = Type.prototype;
+      Constructor.prototype = (isArray(Type) ? Type[Type.length - 1] : Type).prototype;
       instance = new Constructor();
       returnedValue = invoke(Type, instance, locals);
 

diff --git a/test/InjectorSpec.js b/test/InjectorSpec.js
@@ -605,6 +605,15 @@ describe('injector', function() {
     });
 
 
+    it('should instantiate object and preserve constructor property and be instanceof', function() {
+      var t = $injector.instantiate(['book', 'author', Type]);
+      expect(t.book).toEqual('moby');
+      expect(t.author).toEqual('melville');
+      expect(t.title()).toEqual('melville: moby');
+      expect(t instanceof Type).toBe(true);
+    });
+
+
     it('should allow constructor to return different object', function() {
       var obj = {};
       var Class = function() {