Merge branch 'master' of https://github.com/aspnetboilerplate/abp-ng2-module

ismcagdas · ismcagdas · commit ea52e4dfc359 · 2018-03-07T16:34:17.000+03:00
diff --git a/src/abp.module.ngfactory.ts b/src/abp.module.ngfactory.ts
diff --git a/src/abpHttpInterceptor.ts b/src/abpHttpInterceptor.ts
@@ -158,7 +158,7 @@ export class AbpHttpConfiguration {
             if (!ajaxResponse.error) {
                 ajaxResponse.error = this.defaultError;
             }
-            
+
             this.logError(ajaxResponse.error);
             this.showError(ajaxResponse.error);
 
@@ -387,4 +387,4 @@ export class AbpHttpInterceptor implements HttpInterceptor {
 
         return false;
     }
-}
+}
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -10,7 +10,8 @@
     "moduleResolution": "node",
     "paths": {
       "@angular/core": ["node_modules/@angular/core"],
-      "rxjs/*": ["node_modules/rxjs/*"]
+      "rxjs/*": ["node_modules/rxjs/*"],
+      "@abp/*": ["./*"]
     },
     "rootDir": ".",
     "outDir": "dist",
diff --git a/tsconfig.json b/tsconfig.json
@@ -9,7 +9,8 @@
     "module": "es2015",
     "moduleResolution": "node",
     "paths": {
-      "@angular/core": ["node_modules/@angular/core"]
+      "@angular/core": ["node_modules/@angular/core"],
+      "@abp/*": ["src/*"]
     },
     "rootDir": ".",
     "outDir": "dist",

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ export class AbpHttpConfiguration {`
`158`	`158`	`if (!ajaxResponse.error) {`
`159`	`159`	`ajaxResponse.error = this.defaultError;`
`160`	`160`	`}`
`161`		`-`
	`161`	`+`
`162`	`162`	`this.logError(ajaxResponse.error);`
`163`	`163`	`this.showError(ajaxResponse.error);`
`164`	`164`
`@@ -387,4 +387,4 @@ export class AbpHttpInterceptor implements HttpInterceptor {`
`387`	`387`
`388`	`388`	`return false;`
`389`	`389`	`}`
`390`		`-}`
	`390`	`+}`