mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 20:33:32 +08:00
chore(): fix some Slides type errors
This commit is contained in:
@ -1,4 +1,4 @@
|
|||||||
import {Directive, Component, ElementRef, Host, EventEmitter, Output} from 'angular2/core';
|
import {Directive, Component, ElementRef, Host, EventEmitter, Input, Output} from 'angular2/core';
|
||||||
import {NgClass} from 'angular2/common';
|
import {NgClass} from 'angular2/common';
|
||||||
|
|
||||||
import {Ion} from '../ion';
|
import {Ion} from '../ion';
|
||||||
@ -7,7 +7,7 @@ import {Gesture} from '../../gestures/gesture';
|
|||||||
import {DragGesture} from '../../gestures/drag-gesture';
|
import {DragGesture} from '../../gestures/drag-gesture';
|
||||||
import {dom} from '../../util';
|
import {dom} from '../../util';
|
||||||
import {CSS} from '../../util/dom';
|
import {CSS} from '../../util/dom';
|
||||||
import * as util from '../../util';
|
import {debounce, isTrueProperty, defaults} from '../../util/util'
|
||||||
|
|
||||||
import {Swiper} from './swiper-widget';
|
import {Swiper} from './swiper-widget';
|
||||||
import {Scroll} from '../scroll/scroll';
|
import {Scroll} from '../scroll/scroll';
|
||||||
@ -70,17 +70,6 @@ import {Scroll} from '../scroll/scroll';
|
|||||||
*/
|
*/
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ion-slides',
|
selector: 'ion-slides',
|
||||||
inputs: [
|
|
||||||
'autoplay',
|
|
||||||
'loop',
|
|
||||||
'index',
|
|
||||||
'bounce',
|
|
||||||
'pager',
|
|
||||||
'options',
|
|
||||||
'zoom',
|
|
||||||
'zoomDuration',
|
|
||||||
'zoomMax'
|
|
||||||
],
|
|
||||||
template:
|
template:
|
||||||
'<div class="swiper-container">' +
|
'<div class="swiper-container">' +
|
||||||
'<div class="swiper-wrapper">' +
|
'<div class="swiper-wrapper">' +
|
||||||
@ -91,6 +80,44 @@ import {Scroll} from '../scroll/scroll';
|
|||||||
directives: [NgClass]
|
directives: [NgClass]
|
||||||
})
|
})
|
||||||
export class Slides extends Ion {
|
export class Slides extends Ion {
|
||||||
|
|
||||||
|
public rapidUpdate: Function;
|
||||||
|
private showPager: boolean;
|
||||||
|
private slider: typeof Swiper;
|
||||||
|
private maxScale: number;
|
||||||
|
private zoomElement: HTMLElement;
|
||||||
|
private zoomGesture: Gesture;
|
||||||
|
private scale: number;
|
||||||
|
private zoomLastPosX: number;
|
||||||
|
private zoomLastPosY: number;
|
||||||
|
private viewportWidth: number;
|
||||||
|
private viewportHeight: number;
|
||||||
|
private enableZoom: boolean;
|
||||||
|
private touch: {
|
||||||
|
x: number,
|
||||||
|
y: number,
|
||||||
|
startX: number,
|
||||||
|
startY: number,
|
||||||
|
deltaX: number,
|
||||||
|
deltaY: number,
|
||||||
|
lastX: number,
|
||||||
|
lastY: number,
|
||||||
|
target: HTMLElement,
|
||||||
|
zoomable: HTMLElement,
|
||||||
|
zoomableWidth: number,
|
||||||
|
zoomableHeight: number
|
||||||
|
}
|
||||||
|
|
||||||
|
@Input() autoplay: any;
|
||||||
|
@Input() loop: any;
|
||||||
|
@Input() index: any;
|
||||||
|
@Input() bounce: any;
|
||||||
|
@Input() pager: any;
|
||||||
|
@Input() options: any;
|
||||||
|
@Input() zoom: any;
|
||||||
|
@Input() zoomDuration: any;
|
||||||
|
@Input() zoomMax: any;
|
||||||
|
|
||||||
@Output() change: EventEmitter<any> = new EventEmitter();
|
@Output() change: EventEmitter<any> = new EventEmitter();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -98,9 +125,8 @@ export class Slides extends Ion {
|
|||||||
* @param {ElementRef} elementRef TODO
|
* @param {ElementRef} elementRef TODO
|
||||||
*/
|
*/
|
||||||
constructor(elementRef: ElementRef) {
|
constructor(elementRef: ElementRef) {
|
||||||
|
|
||||||
super(elementRef);
|
super(elementRef);
|
||||||
this.rapidUpdate = util.debounce(() => {
|
this.rapidUpdate = debounce(() => {
|
||||||
this.update();
|
this.update();
|
||||||
}, 10);
|
}, 10);
|
||||||
|
|
||||||
@ -111,14 +137,14 @@ export class Slides extends Ion {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
if(!this.options) {
|
if (!this.options) {
|
||||||
this.options = {};
|
this.options = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
this.showPager = util.isTrueProperty(this.pager);
|
this.showPager = isTrueProperty(this.pager);
|
||||||
|
|
||||||
|
|
||||||
var options = util.defaults({
|
var options = defaults({
|
||||||
loop: this.loop,
|
loop: this.loop,
|
||||||
pagination: '.swiper-pagination',
|
pagination: '.swiper-pagination',
|
||||||
paginationClickable: true,
|
paginationClickable: true,
|
||||||
@ -239,7 +265,6 @@ export class Slides extends Ion {
|
|||||||
this.viewportHeight = this.getNativeElement().offsetHeight;
|
this.viewportHeight = this.getNativeElement().offsetHeight;
|
||||||
|
|
||||||
this.zoomElement.addEventListener('touchstart', (e) => {
|
this.zoomElement.addEventListener('touchstart', (e) => {
|
||||||
|
|
||||||
this.onTouchStart(e);
|
this.onTouchStart(e);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -376,12 +401,12 @@ export class Slides extends Ion {
|
|||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
onTransitionStart(swiper) {
|
onTransitionStart(swiper, e) {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
onTransitionEnd(swiper) {
|
onTransitionEnd(swiper, e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -392,9 +417,11 @@ export class Slides extends Ion {
|
|||||||
|
|
||||||
//TODO: Support mice as well
|
//TODO: Support mice as well
|
||||||
|
|
||||||
let target = dom.closest(e.target, '.slide').children[0].children[0];
|
let target = ((dom.closest(e.target, '.slide').children[0] as HTMLElement).children[0] as HTMLElement);
|
||||||
|
|
||||||
this.touch = {
|
this.touch = {
|
||||||
|
x: null,
|
||||||
|
y: null,
|
||||||
startX: e.touches[0].clientX,
|
startX: e.touches[0].clientX,
|
||||||
startY: e.touches[0].clientY,
|
startY: e.touches[0].clientY,
|
||||||
deltaX: 0,
|
deltaX: 0,
|
||||||
@ -474,6 +501,7 @@ export class Slides extends Ion {
|
|||||||
if(this.scale > 1) {
|
if(this.scale > 1) {
|
||||||
|
|
||||||
if(Math.abs(this.touch.x) > this.viewportWidth) {
|
if(Math.abs(this.touch.x) > this.viewportWidth) {
|
||||||
|
//TODO what is posX?
|
||||||
posX = posX > 0 ? this.viewportWidth - 1 : -(this.viewportWidth - 1);
|
posX = posX > 0 ? this.viewportWidth - 1 : -(this.viewportWidth - 1);
|
||||||
console.log('Setting on posx', this.touch.x);
|
console.log('Setting on posx', this.touch.x);
|
||||||
}
|
}
|
||||||
@ -570,6 +598,7 @@ export class Slides extends Ion {
|
|||||||
template: '<div class="slide-zoom"><ng-content></ng-content></div>'
|
template: '<div class="slide-zoom"><ng-content></ng-content></div>'
|
||||||
})
|
})
|
||||||
export class Slide {
|
export class Slide {
|
||||||
|
private ele: HTMLElement;
|
||||||
/**
|
/**
|
||||||
* TODO
|
* TODO
|
||||||
* @param {Slides} slides The containing slidebox.
|
* @param {Slides} slides The containing slidebox.
|
||||||
@ -594,6 +623,6 @@ export class Slide {
|
|||||||
})
|
})
|
||||||
export class SlideLazy {
|
export class SlideLazy {
|
||||||
constructor(elementRef: ElementRef) {
|
constructor(elementRef: ElementRef) {
|
||||||
elementRef.getNativeElement().classList.add('swiper-lazy');
|
elementRef.nativeElement.classList.add('swiper-lazy');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
/*===========================
|
/*===========================
|
||||||
Swiper
|
Swiper
|
||||||
===========================*/
|
===========================*/
|
||||||
export function Swiper(container, params) {
|
export function Swiper(container, params): void {
|
||||||
|
|
||||||
|
|
||||||
if (!(this instanceof Swiper)) return new Swiper(container, params);
|
if (!(this instanceof Swiper)) return new Swiper(container, params);
|
||||||
|
@ -60,7 +60,7 @@ function _baseExtend(dst, objs, deep) {
|
|||||||
return dst;
|
return dst;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function debounce(func: any, wait: number, immediate: boolean) {
|
export function debounce(func: any, wait: number, immediate = false) {
|
||||||
var timeout, args, context, timestamp: number, result;
|
var timeout, args, context, timestamp: number, result;
|
||||||
return function() {
|
return function() {
|
||||||
context = this;
|
context = this;
|
||||||
|
Reference in New Issue
Block a user