Fixes exception with unannotated directive declarations in older Angu…

…lar versions
rev087 · Apr 15, 2015 · 9b35153 · 9b35153
1 parent 1033161
commit 9b35153
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 8 deletions.
diff --git a/ng-inspector.chrome/ng-inspector.js b/ng-inspector.chrome/ng-inspector.js
@@ -732,8 +732,18 @@ NGI.Service = (function() {
 
 		switch(this.provider) {
 			case '$compileProvider':
-				if (!this.factory.$inject) {
-					this.factory.$inject = app.$injector.annotate(this.factory);
+
+				// Unnannotated directives declared in the application will throw an exception.
+				// If $injector.annotate is available in the user's version of Angular we
+				// attempt to salvage it, otherwise return and ignore the directive.
+				if (Object.prototype.toString.call(this.factory) !== '[object Array]') {
+					if (app.$injector.annotate) {
+						var annotated = app.$injector.annotate(this.factory);
+						annotated.push(this.factory);
+						this.factory = annotated;
+					} else {
+						return;
+					}
 				}
 				var dir = app.$injector.invoke(this.factory);
 				if (!dir) {

diff --git a/ng-inspector.safariextension/ng-inspector.js b/ng-inspector.safariextension/ng-inspector.js
@@ -732,8 +732,18 @@ NGI.Service = (function() {
 
 		switch(this.provider) {
 			case '$compileProvider':
-				if (!this.factory.$inject) {
-					this.factory.$inject = app.$injector.annotate(this.factory);
+
+				// Unnannotated directives declared in the application will throw an exception.
+				// If $injector.annotate is available in the user's version of Angular we
+				// attempt to salvage it, otherwise return and ignore the directive.
+				if (Object.prototype.toString.call(this.factory) !== '[object Array]') {
+					if (app.$injector.annotate) {
+						var annotated = app.$injector.annotate(this.factory);
+						annotated.push(this.factory);
+						this.factory = annotated;
+					} else {
+						return;
+					}
 				}
 				var dir = app.$injector.invoke(this.factory);
 				if (!dir) {

diff --git a/src/js/Service.js b/src/js/Service.js
@@ -44,8 +44,18 @@ NGI.Service = (function() {
 
 		switch(this.provider) {
 			case '$compileProvider':
-				if (!this.factory.$inject) {
-					this.factory.$inject = app.$injector.annotate(this.factory);
+
+				// Unnannotated directives declared in the application will throw an exception.
+				// If $injector.annotate is available in the user's version of Angular we
+				// attempt to salvage it, otherwise return and ignore the directive.
+				if (Object.prototype.toString.call(this.factory) !== '[object Array]') {
+					if (app.$injector.annotate) {
+						var annotated = app.$injector.annotate(this.factory);
+						annotated.push(this.factory);
+						this.factory = annotated;
+					} else {
+						return;
+					}
 				}
 				var dir = app.$injector.invoke(this.factory);
 				if (!dir) {

diff --git a/test/e2e/scenarios/lib/ng-inspector.js b/test/e2e/scenarios/lib/ng-inspector.js
@@ -732,8 +732,18 @@ NGI.Service = (function() {
 
 		switch(this.provider) {
 			case '$compileProvider':
-				if (!this.factory.$inject) {
-					this.factory.$inject = app.$injector.annotate(this.factory);
+
+				// Unnannotated directives declared in the application will throw an exception.
+				// If $injector.annotate is available in the user's version of Angular we
+				// attempt to salvage it, otherwise return and ignore the directive.
+				if (Object.prototype.toString.call(this.factory) !== '[object Array]') {
+					if (app.$injector.annotate) {
+						var annotated = app.$injector.annotate(this.factory);
+						annotated.push(this.factory);
+						this.factory = annotated;
+					} else {
+						return;
+					}
 				}
 				var dir = app.$injector.invoke(this.factory);
 				if (!dir) {