|
6 | 6 | var
|
7 | 7 | kind = require('enyo/kind'),
|
8 | 8 | dom = require('enyo/dom'),
|
9 |
| - platform = require('enyo/platform'), |
10 | 9 | utils = require('enyo/utils'),
|
11 | 10 | Animator = require('enyo/Animator'),
|
12 | 11 | Scroller = require('enyo/Scroller');
|
@@ -214,7 +213,7 @@ module.exports = kind(
|
214 | 213 | */
|
215 | 214 | components: [
|
216 | 215 | {name: 'animator', kind: Animator, onStep: 'zoomAnimationStep', onEnd: 'zoomAnimationEnd'},
|
217 |
| - {name: 'viewport', style: 'overflow:hidden;min-height:100%;min-width:100%;', classes: 'enyo-fit', ongesturechange: 'gestureTransform', ongestureend: 'saveState', ontap: 'singleTap', ondblclick: 'doubleClick', onmousewheel: 'mousewheel', ondown: 'handleDown', components: [ |
| 216 | + {name: 'viewport', style: 'overflow:hidden;min-height:100%;min-width:100%;', classes: 'enyo-fit', ongesturechange: 'gestureTransform', ongestureend: 'saveState', ontap: 'singleTap', onmousewheel: 'mousewheel', ondown: 'handleDown', components: [ |
218 | 217 | {name: 'content'}
|
219 | 218 | ]}
|
220 | 219 | ],
|
@@ -468,17 +467,8 @@ module.exports = kind(
|
468 | 467 | params = utils.mixin({translate: this.bounds.left + 'px, ' + this.bounds.top + 'px'}, params);
|
469 | 468 | }
|
470 | 469 | dom.transform(this.$.content, params);
|
471 |
| - } else if (platform.ie) { |
472 |
| - // IE8 does not support transforms, but filter should work |
473 |
| - // http://www.useragentman.com/IETransformsTranslator/ |
474 |
| - var matrix = '"progid:DXImageTransform.Microsoft.Matrix(M11='+scale+', M12=0, M21=0, M22='+scale+', SizingMethod=\'auto expand\')"'; |
475 |
| - this.$.content.applyStyle('-ms-filter', matrix); |
476 |
| - this.$.content.setBounds({width: this.bounds.width*scale + 'px', height: this.bounds.height*scale + 'px', |
477 |
| - left:this.bounds.left + 'px', top:this.bounds.top + 'px'}); |
478 |
| - this.$.content.applyStyle('width', scale*this.bounds.width); |
479 |
| - this.$.content.applyStyle('height', scale*this.bounds.height); |
480 | 470 | } else {
|
481 |
| - // ...no transforms and not IE... there's nothin' I can do. |
| 471 | + // ...no transforms means there's nothin' I can do. |
482 | 472 | }
|
483 | 473 |
|
484 | 474 | //adjust scroller to new position that keeps ratio with the new content size
|
@@ -547,26 +537,6 @@ module.exports = kind(
|
547 | 537 | this.ratioX = this.ratioY = null;
|
548 | 538 | },
|
549 | 539 |
|
550 |
| - /** |
551 |
| - * Normalizes the event and forwards it to |
552 |
| - * [singleTap()]{@link module:layout/PanZoomView~PanZoomView#singleTap}. |
553 |
| - * |
554 |
| - * IE 8 Only |
555 |
| - * |
556 |
| - * @private |
557 |
| - */ |
558 |
| - doubleClick: function (sender, event) { |
559 |
| - //IE 8 fix; dblclick fires rather than multiple successive click events |
560 |
| - if (platform.ie==8) { |
561 |
| - this.tapped = true; |
562 |
| - //normalize event |
563 |
| - event.pageX = event.clientX + event.target.scrollLeft; |
564 |
| - event.pageY = event.clientY + event.target.scrollTop; |
565 |
| - this.singleTap(sender, event); |
566 |
| - event.preventDefault(); |
567 |
| - } |
568 |
| - }, |
569 |
| - |
570 | 540 | /**
|
571 | 541 | * Simulates double-tap by watching for two taps within 300ms of each other.
|
572 | 542 | *
|
|
0 commit comments