|
1 | 1 | import {Observable} from 'rxjs/Observable'; |
2 | 2 | import {UUID} from 'angular2-uuid'; |
3 | 3 | import {Injectable} from '@angular/core'; |
4 | | -import {map} from 'rxjs/operators'; |
| 4 | +import {concatMap, map} from 'rxjs/operators'; |
5 | 5 | import 'rxjs/add/observable/fromEvent'; |
6 | 6 | import 'rxjs/add/observable/of'; |
7 | 7 |
|
@@ -42,21 +42,24 @@ export class ImageDataConverter { |
42 | 42 | let reader = this.getBase64FromFile(file); |
43 | 43 |
|
44 | 44 | return reader |
45 | | - .concatMap((data: string) => { |
46 | | - properties.data = data; |
| 45 | + .pipe( |
| 46 | + concatMap((data: string) => { |
| 47 | + properties.data = data; |
47 | 48 |
|
48 | | - if (properties.type.indexOf('image') === 0) { |
49 | | - return this.getImageDimensions(data); |
50 | | - } else { |
51 | | - return Observable.of({width: 0, height: 0}); |
52 | | - } |
53 | | - }) |
54 | | - .map((dimensions: IImageDimensions) => { |
55 | | - properties.width = dimensions.width; |
56 | | - properties.height = dimensions.height; |
| 49 | + if (properties.type.indexOf('image') === 0) { |
| 50 | + return this.getImageDimensions(data); |
| 51 | + } else { |
| 52 | + return Observable.of({width: 0, height: 0}); |
| 53 | + } |
| 54 | + }), |
| 55 | + map((dimensions: IImageDimensions) => { |
| 56 | + properties.width = dimensions.width; |
| 57 | + properties.height = dimensions.height; |
| 58 | + |
| 59 | + return properties; |
| 60 | + }) |
57 | 61 |
|
58 | | - return properties; |
59 | | - }) |
| 62 | + ) |
60 | 63 | } |
61 | 64 |
|
62 | 65 | /** |
|
0 commit comments