Skip to content

Commit 85578e6

Browse files
committed
click with animation
1 parent 66426b1 commit 85578e6

File tree

3 files changed

+6981
-6
lines changed

3 files changed

+6981
-6
lines changed

projects/slider/src/lib/slider.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ <h2 *ngIf="slide.title" [innerHtml]="slide.title" [class.h2-no-button]="!slide.b
2020
<section class="bullet-container">
2121
<span class="bullet" *ngFor="let x of slides; index as i;"
2222
[class.square]="squareBullets"
23-
[class.active]="i+1==currentSlidePos" (click)="setSlide(i+1)"></span>
23+
[class.active]="i+1==currentSlidePos" (click)="setSlideWidthAnimation(i+1)"></span>
2424
</section>

projects/slider/src/lib/slider.component.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class SliderComponent implements OnInit, AfterViewInit {
8585
return;
8686
}
8787
this.isDragging = false;
88-
this.setSlide(this.currentSlidePos);
88+
this.setSlideWidthAnimation(this.currentSlidePos);
8989
}
9090

9191
@HostListener('mouseup', ['$event']) onMouseUp(e: MouseEvent) {
@@ -135,18 +135,18 @@ export class SliderComponent implements OnInit, AfterViewInit {
135135
const minMovement = this.sliderElement.clientWidth * 0.18;
136136

137137
if (Math.abs(this.posSlider.posEndX - this.posSlider.posInitX) < minMovement) {
138-
this.setSlideWidthAnimation(this.currentSlidePos, this.currentSlidePos);
138+
this.setSlideWidthAnimation(this.currentSlidePos);
139139
return;
140140
}
141141

142142
if ((this.posSlider.posEndX < this.posSlider.posInitX) && (this.currentSlidePos < this.slideNumber)) {
143-
this.setSlideWidthAnimation(this.currentSlidePos, this.currentSlidePos + 1);
143+
this.setSlideWidthAnimation(this.currentSlidePos + 1);
144144
} else if ((this.currentSlidePos > 1) && (this.posSlider.posEndX > this.posSlider.posInitX)) {
145-
this.setSlideWidthAnimation(this.currentSlidePos, this.currentSlidePos - 1);
145+
this.setSlideWidthAnimation(this.currentSlidePos - 1);
146146
}
147147
}
148148

149-
setSlideWidthAnimation(slideInit, slideEnd) {
149+
setSlideWidthAnimation(slideEnd) {
150150
let t = 0;
151151
const posInit = this.sliderElement.scrollLeft;
152152
const posEnd = this.sliderElement.clientWidth * (slideEnd - 1);

0 commit comments

Comments
 (0)