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

Revert "chore(): fix Swiper types"

Browse Source 
This reverts commit 2d10593dce04b11d92ae4155b6e18256f4c54418.
This commit is contained in:
Tim Lancina
2016-01-19 11:34:02 -06:00
parent 3213d02375
commit 1b21be81aa
1 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ionic/components/slides/swiper-widget.ts
View File

@ -1,14 +1,3 @@
//http://stackoverflow.com/questions/30960386/how-to-extend-the-window-typescript-interface
interface IWindow extends Window {
Date: DateConstructor,
Image: new(width?: number, height?: number) => HTMLImageElement,
WebKitCSSMatrix: new(text?: string) => WebKitCSSMatrix,
MutationObserver: new(callback: MutationCallback) => MutationObserver,
WebkitMutationObserver: new(callback: MutationCallback) => MutationObserver,
WheelEvent: new(typeArg: string, eventInitDict?: WheelEventInit) => WheelEvent,
CustomEvent: new(typeArg: string, eventInitDict?: CustomEventInit) => CustomEvent
}
/**
* Swiper 3.1.2
* Most modern mobile touch slider and framework with hardware accelerated transitions
@ -240,7 +229,7 @@ export function Swiper(container, params): void {
}
if (typeof $ === 'undefined') {
if (typeof Dom7 === 'undefined') {
//$ = window.Dom7 || window.Zepto || window.jQuery;
$ = window.Dom7 || window.Zepto || window.jQuery;
}
else {
$ = Dom7;
@ -417,7 +406,7 @@ export function Swiper(container, params): void {
}
if (!imgElement.complete || !checkForComplete) {
if (src) {
image = new (<IWindow>window).Image();
image = new window.Image();
image.onload = onReady;
image.onerror = onReady;
image.src = src;
@ -1217,7 +1206,7 @@ export function Swiper(container, params): void {
var preventDefault = true;
if ($(e.target).is(formElements)) preventDefault = false;
if (document.activeElement && $(document.activeElement).is(formElements)) {
(<HTMLElement>document.activeElement).blur();
document.activeElement.blur();
}
if (preventDefault) {
e.preventDefault();
@ -1373,7 +1362,7 @@ export function Swiper(container, params): void {
}
velocities.push({
position: s.touches[isH() ? 'currentX' : 'currentY'],
time: (new (<IWindow>window).Date()).getTime()
time: (new window.Date()).getTime()
});
}
// Update progress
@ -1464,7 +1453,7 @@ export function Swiper(container, params): void {
}
// this implies that the user stopped moving a finger then released.
// There would be no events with distance zero, so the last event is stale.
if (time > 150 || (new (<IWindow>window).Date().getTime() - lastMoveEvent.time) > 300) {
if (time > 150 || (new window.Date().getTime() - lastMoveEvent.time) > 300) {
s.velocity = 0;
}
} else {
@ -1823,10 +1812,10 @@ export function Swiper(container, params): void {
}
curStyle = window.getComputedStyle(el, null);
if ((<IWindow>window).WebKitCSSMatrix) {
if (window.WebKitCSSMatrix) {
// Some old versions of Webkit choke when 'none' is passed; pass
// empty string instead in this case
transformMatrix = new (<IWindow>window).WebKitCSSMatrix(curStyle.webkitTransform === 'none' ? '' : curStyle.webkitTransform);
transformMatrix = new window.WebKitCSSMatrix(curStyle.webkitTransform === 'none' ? '' : curStyle.webkitTransform);
}
else {
transformMatrix = curStyle.MozTransform || curStyle.OTransform || curStyle.MsTransform || curStyle.msTransform || curStyle.transform || curStyle.getPropertyValue('transform').replace('translate(', 'matrix(1, 0, 0, 1,');
@ -1835,7 +1824,7 @@ export function Swiper(container, params): void {
if (axis === 'x') {
//Latest Chrome and webkits Fix
if ((<IWindow>window).WebKitCSSMatrix)
if (window.WebKitCSSMatrix)
curTransform = transformMatrix.m41;
//Crazy IE10 Matrix
else if (matrix.length === 16)
@ -1846,7 +1835,7 @@ export function Swiper(container, params): void {
}
if (axis === 'y') {
//Latest Chrome and webkits Fix
if ((<IWindow>window).WebKitCSSMatrix)
if (window.WebKitCSSMatrix)
curTransform = transformMatrix.m42;
//Crazy IE10 Matrix
else if (matrix.length === 16)
@ -1869,10 +1858,10 @@ export function Swiper(container, params): void {
Observer
===========================*/
s.observers = [];
function initObserver(target, options?: any) {
function initObserver(target, options) {
options = options || {};
// create an observer instance
var ObserverFunc = (<IWindow>window).MutationObserver || (<IWindow>window).WebkitMutationObserver;
var ObserverFunc = window.MutationObserver || window.WebkitMutationObserver;
var observer = new ObserverFunc(function (mutations) {
mutations.forEach(function (mutation) {
s.onResize(true);
@ -2689,11 +2678,11 @@ export function Swiper(container, params): void {
===========================*/
s.mousewheel = {
event: false,
lastScrollTime: (new (<IWindow>window).Date()).getTime()
lastScrollTime: (new window.Date()).getTime()
};
if (s.params.mousewheelControl) {
try {
new (<IWindow>window).WheelEvent('wheel');
new window.WheelEvent('wheel');
s.mousewheel.event = 'wheel';
} catch (e) {}
@ -2748,7 +2737,7 @@ export function Swiper(container, params): void {
if (s.params.mousewheelInvert) delta = -delta;
if (!s.params.freeMode) {
if ((new (<IWindow>window).Date()).getTime() - s.mousewheel.lastScrollTime > 60) {
if ((new window.Date()).getTime() - s.mousewheel.lastScrollTime > 60) {
if (delta < 0) {
if ((!s.isEnd || s.params.loop) && !s.animating) s.slideNext();
else if (s.params.mousewheelReleaseOnEdges) return true;
@ -2758,7 +2747,7 @@ export function Swiper(container, params): void {
else if (s.params.mousewheelReleaseOnEdges) return true;
}
}
s.mousewheel.lastScrollTime = (new (<IWindow>window).Date()).getTime();
s.mousewheel.lastScrollTime = (new window.Date()).getTime();
}
else {
@ -3206,11 +3195,11 @@ export function Swiper(container, params): void {
Feature Detection
====================================================*/
support: {
touch : /*(window.Modernizr && Modernizr.touch === true) ||*/ (function () {
return !!(('ontouchstart' in window) /*|| window.DocumentTouch && document instanceof DocumentTouch*/);
touch : (window.Modernizr && Modernizr.touch === true) || (function () {
return !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch);
})(),
transforms3d : /*(window.Modernizr && Modernizr.csstransforms3d === true) ||*/ (function () {
transforms3d : (window.Modernizr && Modernizr.csstransforms3d === true) || (function () {
var div = document.createElement('div').style;
return ('webkitPerspective' in div || 'MozPerspective' in div || 'OPerspective' in div || 'MsPerspective' in div || 'perspective' in div);
})(),
@ -3237,8 +3226,8 @@ export function Swiper(container, params): void {
/*===========================
Dom7 Library
===========================*/
var Dom7 = (function () {
var Dom7: (arr: any) => void = function (arr) {
var Dom7 = (function () {
var Dom7 = function (arr) {
var _this = this, i = 0;
// Create array-like object
for (i = 0; i < arr.length; i++) {
@ -3248,7 +3237,7 @@ export function Swiper(container, params): void {
// Return collection with methods
return this;
};
var $: any = function (selector, context?: any) {
var $ = function (selector, context) {
var arr = [], i = 0;
if (selector && !context) {
if (selector instanceof Dom7) {
@ -3484,7 +3473,7 @@ export function Swiper(container, params): void {
for (var i = 0; i < this.length; i++) {
var evt;
try {
evt = new (<IWindow>window).CustomEvent(eventName, {detail: eventData, bubbles: true, cancelable: true});
evt = new window.CustomEvent(eventName, {detail: eventData, bubbles: true, cancelable: true});
}
catch (e) {
evt = document.createEvent('Event');
@ -3623,8 +3612,8 @@ export function Swiper(container, params): void {
var compareWith, i;
if (typeof selector === 'string') {
var el = this[0];
if (el === document) return selector === 'document';
if (el === window) return selector === 'window';
if (el === document) return selector === document;
if (el === window) return selector === window;
if (el.matches) return el.matches(selector);
else if (el.webkitMatchesSelector) return el.webkitMatchesSelector(selector);
@ -3898,7 +3887,7 @@ export function Swiper(container, params): void {
// Required DOM Plugins
var domLib;
if (typeof Dom7 === 'undefined') {
//domLib = window.Dom7 || window.Zepto || window.jQuery;
domLib = window.Dom7 || window.Zepto || window.jQuery;
}
else {
domLib = Dom7;