2
0

fixing firefox bug

This commit is contained in:
2018-08-26 14:13:22 +02:00
parent f11be5ceed
commit 15cf786e90
4 changed files with 21 additions and 4 deletions

View File

@@ -15,6 +15,7 @@
*/ */
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
// import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { MomentModule } from 'ngx-moment'; import { MomentModule } from 'ngx-moment';
@@ -36,6 +37,7 @@ import { GraphService } from './services/graph.service';
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
// BrowserAnimationsModule,
ReactiveFormsModule, ReactiveFormsModule,
FormsModule, FormsModule,
MomentModule, MomentModule,

View File

@@ -14,6 +14,21 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
// svg {
// stroke-dasharray: 1000px;
// stroke-dashoffset: 0px;
// animation: draw 6s;
// }
// @keyframes draw {
// from {
// stroke-dashoffset: 1000px;
// }
// to {
// stroke-dashoffset: 0px;
// }
// }
:host { :host {
position: absolute; position: absolute;
width: 100%; width: 100%;

View File

@@ -160,8 +160,8 @@ export class GraphsComponent implements OnChanges, OnInit {
} }
private updateMatrix() { private updateMatrix() {
const totalArea = Math.abs(this.canvas.clientWidth * this.canvas.clientHeight); const totalArea = Math.abs(this.canvas.getBoundingClientRect().width * this.canvas.getBoundingClientRect().height);
const totalCenter = this.math.centerOfArea(this.canvas.clientWidth, this.canvas.clientHeight); const totalCenter = this.math.centerOfArea(this.canvas.getBoundingClientRect().width, this.canvas.getBoundingClientRect().height);
const baseArea = Math.abs(this.config.width * this.config.height); const baseArea = Math.abs(this.config.width * this.config.height);
const baseScale = Math.pow(totalArea / baseArea * this.config.scale, 0.5); const baseScale = Math.pow(totalArea / baseArea * this.config.scale, 0.5);

View File

@@ -61,8 +61,6 @@ export class GuillocheDirective implements OnChanges, OnDestroy {
private graphService: GraphService, private graphService: GraphService,
private animationService: AnimationService private animationService: AnimationService
) { ) {
this.group = Selection.select(el.nativeElement);
this.canvas = Selection.select(this.canvasService.get);
} }
ngOnDestroy() { ngOnDestroy() {
@@ -70,6 +68,8 @@ export class GuillocheDirective implements OnChanges, OnDestroy {
} }
ngOnChanges(changes: SimpleChanges) { ngOnChanges(changes: SimpleChanges) {
this.group = Selection.select(this.el.nativeElement);
this.canvas = Selection.select(this.canvasService.get);
// @todo modify graph here instead of in graphs.component.ts // @todo modify graph here instead of in graphs.component.ts
this.initialNodes = this.graph.nodes.slice(); this.initialNodes = this.graph.nodes.slice();
this.medianPoint = this.math.medianOfCurve(this.initialNodes); this.medianPoint = this.math.medianOfCurve(this.initialNodes);