Skip to content
This repository has been archived by the owner on Aug 6, 2022. It is now read-only.

Commit

Permalink
Fixed merge conflicts from the 4.x.x merge
Browse files Browse the repository at this point in the history
sconix committed Dec 12, 2017
2 parents 12b3da4 + 673152e commit fd3d22e
Showing 4 changed files with 89 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ npm link ngx-swiper-wrapper
### Installing and usage

```bash
npm install ngx-swiper-wrapper --save
npm install ngx-swiper-wrapper@4.7.0 --save
```

##### Load the module for your app (with global configuration):
83 changes: 83 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/lib/swiper.component.ts
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ import { SwiperConfig, SwiperConfigInterface, SwiperRenderBulletFunction } from

@Component({
selector: 'swiper',
exportAs: 'ngxSwiper',
templateUrl: './lib/swiper.component.html',
styleUrls: [ './lib/swiper.component.css' ],
encapsulation: ViewEncapsulation.None
4 changes: 4 additions & 0 deletions src/lib/swiper.interfaces.ts
Original file line number Diff line number Diff line change
@@ -8,6 +8,10 @@ export const SwiperEvents = [

'scroll',
'progress',
'keyPress',

'beforeResize',
'afterResize',

'resize',
'breakpoint',

0 comments on commit fd3d22e

Please sign in to comment.