ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-18 14:58:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code cleaned up

Browse Source
This commit is contained in:
Piotr Pekala
2019-03-26 03:25:49 -07:00
parent d61825506a
commit ef3acfa459
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/local-server/local-server.component.spec.ts
View File

@ -7,7 +7,7 @@ import { MockedServerService } from '../../services/server.service.spec';
import { Server } from '../../models/server'; import { Server } from '../../models/server';
fdescribe('LocalServerComponent', () => { describe('LocalServerComponent', () => {
let component: LocalServerComponent; let component: LocalServerComponent;
let fixture: ComponentFixture<LocalServerComponent>; let fixture: ComponentFixture<LocalServerComponent>;
let router: any; let router: any;

19
src/app/components/project-map/project-map.component.ts
View File

@ -59,7 +59,6 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
public server: Server; public server: Server;
public selectedDrawing: string; public selectedDrawing: string;
private ws: Subject<any>; private ws: Subject<any>;
private image;
tools = { tools = {
selection: true, selection: true,
@ -364,16 +363,20 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
} }
private readImageFile(fileInput) { private readImageFile(fileInput) {
var file: File = fileInput.files[0]; let file: File = fileInput.files[0];
var fileReader: FileReader = new FileReader(); let fileReader: FileReader = new FileReader();
let imageToUpload = new Image();
fileReader.onloadend = (e) => { fileReader.onloadend = () => {
this.image = fileReader.result; let image = fileReader.result;
let svg = `<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" height=\"1086\" width=\"2106\">\n<image height=\"1086\" width=\"2106\" xlink:href=\"${this.image}\"/>\n</svg>`; let svg = `<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"
this.drawingService.add(this.server, this.project.project_id, 0, 0, svg).subscribe(() => {}); height=\"${imageToUpload.height}\" width=\"${imageToUpload.width}\">\n<image height=\"${imageToUpload.height}\" width=\"${imageToUpload.width}\"
xlink:href=\"${image}\"/>\n</svg>`;
this.drawingService.add(this.server, this.project.project_id, -(imageToUpload.width/2), -(imageToUpload.height/2), svg).subscribe(() => {});
} }
fileReader.readAsDataURL(file); imageToUpload.onload = () => { fileReader.readAsDataURL(file) };
imageToUpload.src = window.URL.createObjectURL(file);
} }
public ngOnDestroy() { public ngOnDestroy() {