javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(swiper): fix reference for closure advanced

Browse Source
This commit is contained in:
Adam Bradley
2017-01-19 14:59:19 -08:00
parent 7824c79d60
commit 8338a90d85
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/slides/swiper/swiper-controller.ts
View File

@@ -4,13 +4,12 @@ import { fixLoop, onTransitionEnd, onTransitionStart } from './swiper';
import { updateActiveIndex } from './swiper-index';
import { isHorizontal, maxTranslate, minTranslate } from './swiper-utils';
import { updateProgress } from './swiper-progress';
import { setWrapperTransition, setWrapperTranslate } from './swiper-transition';
/*=========================
Controller
===========================*/
export const SWIPER_CONTROLLER: any = {
export const SWIPER_CONTROLLER = {
LinearSpline: function (s: Slides, plt: Platform, x: any, y: any) {
this.x = x;
this.y = y;
@@ -50,10 +49,10 @@ export const SWIPER_CONTROLLER: any = {
// xxx: for now i will just save one spline function to to
getInterpolateFunction: function (s: Slides, plt: Platform, c: Slides) {
if (!s._spline) s._spline = s.loop ?
new SWIPER_CONTROLLER.LinearSpline(s, plt, s._slidesGrid, c._slidesGrid) :
new SWIPER_CONTROLLER.LinearSpline(s, plt, s._snapGrid, c._snapGrid);
new (<any>SWIPER_CONTROLLER).LinearSpline(s, plt, s._slidesGrid, c._slidesGrid) :
new (<any>SWIPER_CONTROLLER).LinearSpline(s, plt, s._snapGrid, c._snapGrid);
},
setTranslate: function (s: Slides, plt: Platform, translate: number, byController: Slides) {
setTranslate: function (s: Slides, plt: Platform, translate: number, byController: Slides, setWrapperTranslate: any) {
var controlled = s.control;
var multiplier: number, controlledTranslate: number;
function setControlledTranslate(c: Slides) {
@@ -91,7 +90,7 @@ export const SWIPER_CONTROLLER: any = {
setControlledTranslate(controlled);
}
},
setTransition: function (s: Slides, plt: Platform, duration: number, byController: Slides) {
setTransition: function (s: Slides, plt: Platform, duration: number, byController: Slides, setWrapperTransition: any) {
var controlled = s.control;
var i: number;
function setControlledTransition(c: Slides) {

4
src/components/slides/swiper/swiper-transition.ts
View File

@@ -54,7 +54,7 @@ export function setWrapperTranslate(s: Slides, plt: Platform, translate: any, sh
}
if (s.control) {
SWIPER_CONTROLLER.setTranslate(s, plt, s._translate, byController);
SWIPER_CONTROLLER.setTranslate(s, plt, s._translate, byController, setWrapperTranslate);
}
}
@@ -144,6 +144,6 @@ export function setWrapperTransition(s: Slides, plt: Platform, duration: number,
}
if (s.control) {
SWIPER_CONTROLLER.setTransition(s, plt, duration, byController);
SWIPER_CONTROLLER.setTransition(s, plt, duration, byController, setWrapperTransition);
}
}