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

Moving zoom to slides

Browse Source
This commit is contained in:
Max Lynch
2015-09-02 09:28:37 -05:00
parent e083febf86
commit 4929fc2a77
3 changed files with 95 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ionic/components/scroll/scroll.ts
View File

@@ -120,12 +120,26 @@ export class Scroll extends Ion {
this.zoomElement.addEventListener('touchend', (e) => {
console.log('PANEND', e);
if(Math.abs(posX) > viewportWidth) {
posX = posX > 0 ? viewportWidth - 1 : -(viewportWidth - 1);
console.log('Setting on posx', posX);
if(this.scale > 1) {
if(Math.abs(posX) > viewportWidth) {
posX = posX > 0 ? viewportWidth - 1 : -(viewportWidth - 1);
console.log('Setting on posx', posX);
}
if(posY > viewportHeight/2) {
let z = new Animation(this.zoomElement.parentElement);
z.fromTo('translateY', posY + 'px', Math.min(viewportHeight/2 + 30, posY));
z.play();
} else {
let z = new Animation(this.zoomElement.parentElement);
z.fromTo('translateY', posY + 'px', Math.max(viewportHeight/2 - 30, posY));
z.play();
}
this.zoomLastPosX = posX;
this.zoomLastPosY = posY;
}
this.zoomLastPosX = posX;
this.zoomLastPosY = posY;
});
this.zoomGesture.on('pinchstart', (e) => {
@@ -156,6 +170,7 @@ export class Scroll extends Ion {
});
this.zoomGesture.on('doubletap', (e) => {
console.log('Double');
let x = e.pointers[0].clientX;
let y = e.pointers[0].clientY;