Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 31a47cf

Browse files
authored
Merge pull request #14 from qjon/develop
v1.2.1
2 parents e7919be + 5433017 commit 31a47cf

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ This project is a very simple __Angular2 file manager__.
1010

1111
## Features
1212

13+
14+
### v1.2.1
15+
* fix issue - upload files to localStorage
16+
1317
### v1.2.0
1418
* add "forRoot" to module initialization
1519
* change translation module to _ng2-translate_

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rign/angular2-filemanager",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"license": "MIT",
55
"angular-cli": {},
66
"scripts": {

src/services/imageDataConverter.service.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Observable} from 'rxjs/Observable';
22
import {UUID} from 'angular2-uuid';
33
import {Injectable} from '@angular/core';
4-
import {map} from 'rxjs/operators';
4+
import {concatMap, map} from 'rxjs/operators';
55
import 'rxjs/add/observable/fromEvent';
66
import 'rxjs/add/observable/of';
77

@@ -42,21 +42,24 @@ export class ImageDataConverter {
4242
let reader = this.getBase64FromFile(file);
4343

4444
return reader
45-
.concatMap((data: string) => {
46-
properties.data = data;
45+
.pipe(
46+
concatMap((data: string) => {
47+
properties.data = data;
4748

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+
})
5761

58-
return properties;
59-
})
62+
)
6063
}
6164

6265
/**

0 commit comments

Comments
 (0)