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

Remove tap location zoom

Browse Source
This commit is contained in:
Max Lynch
2015-09-01 15:51:49 -05:00
parent 11f47a72a1
commit 87efc08c8a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,13 +188,13 @@ export class Scroll extends Ion {
.easing('linear');
let za = new Animation();
za.add(zi, zw);
za.add(zi);//, zw);
if(this.scale > 1) {
// Zoom out
zw.fromTo('translateX', posX + 'px', '0px');
zw.fromTo('translateY', posY + 'px', '0px');
//zw.fromTo('translateX', posX + 'px', '0px');
//zw.fromTo('translateY', posY + 'px', '0px');
zi.from('scale', this.scale);
zi.to('scale', 1);
@@ -207,8 +207,8 @@ export class Scroll extends Ion {
} else {
// Zoom in
zw.fromTo('translateX', posX + 'px', tx + 'px');
zw.fromTo('translateY', posY + 'px', ty + 'px');
//zw.fromTo('translateX', posX + 'px', tx + 'px');
//zw.fromTo('translateY', posY + 'px', ty + 'px');
zi.from('scale', this.scale);
zi.to('scale', this.maxScale);