Skip to content

Commit

Permalink
add build files
Browse files Browse the repository at this point in the history
  • Loading branch information
@sculove
sculove committed Apr 18, 2016
1 parent 927509c commit 2c95176
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 35 deletions.
35 changes: 28 additions & 7 deletions build/iscroll-infinite.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,22 @@ var utils = (function () {
ev;

if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
ev = document.createEvent('MouseEvents');
ev.initMouseEvent('click', true, true, e.view, 1,
target.screenX, target.screenY, target.clientX, target.clientY,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
0, null);

// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/initMouseEvent
// initMouseEvent is deprecated.
ev = document.createEvent(window.MouseEvent ? 'MouseEvents' : 'Event');
ev.initEvent('click', true, true);
ev.view = e.view;
ev.detail = 1;
ev.screenX = target.screenX || 0;
ev.screenY = target.screenY || 0;
ev.clientX = target.clientX || 0;
ev.clientY = target.clientY || 0;
ev.ctrlKey = !!e.ctrlKey;
ev.altKey = !!e.altKey;
ev.shiftKey = !!e.shiftKey;
ev.metaKey = !!e.metaKey;
ev.button = 0;
ev.relatedTarget = null;
ev._constructed = true;
target.dispatchEvent(ev);
}
Expand Down Expand Up @@ -336,6 +346,11 @@ function IScroll (el, options) {
this.options.tap = 'tap';
}

// https://github.com/cubiq/iscroll/issues/1029
if (!this.options.useTransition && !this.options.useTransform) {
this.scrollerStyle.position = "relative";
}

this.options.invertWheelDirection = this.options.invertWheelDirection ? -1 : 1;

if ( this.options.infiniteElements ) {
Expand Down Expand Up @@ -850,9 +865,15 @@ IScroll.prototype = {
},

_transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;

var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.scrollerStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down
35 changes: 28 additions & 7 deletions build/iscroll-lite.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,22 @@ var utils = (function () {
ev;

if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
ev = document.createEvent('MouseEvents');
ev.initMouseEvent('click', true, true, e.view, 1,
target.screenX, target.screenY, target.clientX, target.clientY,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
0, null);

// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/initMouseEvent
// initMouseEvent is deprecated.
ev = document.createEvent(window.MouseEvent ? 'MouseEvents' : 'Event');
ev.initEvent('click', true, true);
ev.view = e.view;
ev.detail = 1;
ev.screenX = target.screenX || 0;
ev.screenY = target.screenY || 0;
ev.clientX = target.clientX || 0;
ev.clientY = target.clientY || 0;
ev.ctrlKey = !!e.ctrlKey;
ev.altKey = !!e.altKey;
ev.shiftKey = !!e.shiftKey;
ev.metaKey = !!e.metaKey;
ev.button = 0;
ev.relatedTarget = null;
ev._constructed = true;
target.dispatchEvent(ev);
}
Expand Down Expand Up @@ -329,6 +339,11 @@ function IScroll (el, options) {
this.options.tap = 'tap';
}

// https://github.com/cubiq/iscroll/issues/1029
if (!this.options.useTransition && !this.options.useTransform) {
this.scrollerStyle.position = "relative";
}

// INSERT POINT: NORMALIZATION

// Some defaults
Expand Down Expand Up @@ -790,9 +805,15 @@ IScroll.prototype = {
},

_transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;

var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.scrollerStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down
45 changes: 38 additions & 7 deletions build/iscroll-probe.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,22 @@ var utils = (function () {
ev;

if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
ev = document.createEvent('MouseEvents');
ev.initMouseEvent('click', true, true, e.view, 1,
target.screenX, target.screenY, target.clientX, target.clientY,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
0, null);

// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/initMouseEvent
// initMouseEvent is deprecated.
ev = document.createEvent(window.MouseEvent ? 'MouseEvents' : 'Event');
ev.initEvent('click', true, true);
ev.view = e.view;
ev.detail = 1;
ev.screenX = target.screenX || 0;
ev.screenY = target.screenY || 0;
ev.clientX = target.clientX || 0;
ev.clientY = target.clientY || 0;
ev.ctrlKey = !!e.ctrlKey;
ev.altKey = !!e.altKey;
ev.shiftKey = !!e.shiftKey;
ev.metaKey = !!e.metaKey;
ev.button = 0;
ev.relatedTarget = null;
ev._constructed = true;
target.dispatchEvent(ev);
}
Expand Down Expand Up @@ -335,6 +345,11 @@ function IScroll (el, options) {
this.options.tap = 'tap';
}

// https://github.com/cubiq/iscroll/issues/1029
if (!this.options.useTransition && !this.options.useTransform) {
this.scrollerStyle.position = "relative";
}

if ( this.options.shrinkScrollbars == 'scale' ) {
this.options.useTransition = false;
}
Expand Down Expand Up @@ -844,9 +859,15 @@ IScroll.prototype = {
},

_transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;

var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.scrollerStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down Expand Up @@ -1735,6 +1756,9 @@ function Indicator (scroller, options) {
if ( this.options.fade ) {
this.wrapperStyle[utils.style.transform] = this.scroller.translateZ;
var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}
this.wrapperStyle[durationProp] = utils.isBadAndroid ? '0.0001ms' : '0ms';
// remove 0.0001ms
var self = this;
Expand Down Expand Up @@ -1904,8 +1928,15 @@ Indicator.prototype = {
},

transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;
var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.indicatorStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down
45 changes: 38 additions & 7 deletions build/iscroll-zoom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,22 @@ var utils = (function () {
ev;

if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
ev = document.createEvent('MouseEvents');
ev.initMouseEvent('click', true, true, e.view, 1,
target.screenX, target.screenY, target.clientX, target.clientY,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
0, null);

// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/initMouseEvent
// initMouseEvent is deprecated.
ev = document.createEvent(window.MouseEvent ? 'MouseEvents' : 'Event');
ev.initEvent('click', true, true);
ev.view = e.view;
ev.detail = 1;
ev.screenX = target.screenX || 0;
ev.screenY = target.screenY || 0;
ev.clientX = target.clientX || 0;
ev.clientY = target.clientY || 0;
ev.ctrlKey = !!e.ctrlKey;
ev.altKey = !!e.altKey;
ev.shiftKey = !!e.shiftKey;
ev.metaKey = !!e.metaKey;
ev.button = 0;
ev.relatedTarget = null;
ev._constructed = true;
target.dispatchEvent(ev);
}
Expand Down Expand Up @@ -338,6 +348,11 @@ function IScroll (el, options) {
this.options.tap = 'tap';
}

// https://github.com/cubiq/iscroll/issues/1029
if (!this.options.useTransition && !this.options.useTransform) {
this.scrollerStyle.position = "relative";
}

if ( this.options.shrinkScrollbars == 'scale' ) {
this.options.useTransition = false;
}
Expand Down Expand Up @@ -842,9 +857,15 @@ IScroll.prototype = {
},

_transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;

var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.scrollerStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down Expand Up @@ -1901,6 +1922,9 @@ function Indicator (scroller, options) {
if ( this.options.fade ) {
this.wrapperStyle[utils.style.transform] = this.scroller.translateZ;
var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}
this.wrapperStyle[durationProp] = utils.isBadAndroid ? '0.0001ms' : '0ms';
// remove 0.0001ms
var self = this;
Expand Down Expand Up @@ -2061,8 +2085,15 @@ Indicator.prototype = {
},

transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;
var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.indicatorStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down
45 changes: 38 additions & 7 deletions build/iscroll.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,22 @@ var utils = (function () {
ev;

if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
ev = document.createEvent('MouseEvents');
ev.initMouseEvent('click', true, true, e.view, 1,
target.screenX, target.screenY, target.clientX, target.clientY,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
0, null);

// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/initMouseEvent
// initMouseEvent is deprecated.
ev = document.createEvent(window.MouseEvent ? 'MouseEvents' : 'Event');
ev.initEvent('click', true, true);
ev.view = e.view;
ev.detail = 1;
ev.screenX = target.screenX || 0;
ev.screenY = target.screenY || 0;
ev.clientX = target.clientX || 0;
ev.clientY = target.clientY || 0;
ev.ctrlKey = !!e.ctrlKey;
ev.altKey = !!e.altKey;
ev.shiftKey = !!e.shiftKey;
ev.metaKey = !!e.metaKey;
ev.button = 0;
ev.relatedTarget = null;
ev._constructed = true;
target.dispatchEvent(ev);
}
Expand Down Expand Up @@ -335,6 +345,11 @@ function IScroll (el, options) {
this.options.tap = 'tap';
}

// https://github.com/cubiq/iscroll/issues/1029
if (!this.options.useTransition && !this.options.useTransform) {
this.scrollerStyle.position = "relative";
}

if ( this.options.shrinkScrollbars == 'scale' ) {
this.options.useTransition = false;
}
Expand Down Expand Up @@ -835,9 +850,15 @@ IScroll.prototype = {
},

_transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;

var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.scrollerStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down Expand Up @@ -1717,6 +1738,9 @@ function Indicator (scroller, options) {
if ( this.options.fade ) {
this.wrapperStyle[utils.style.transform] = this.scroller.translateZ;
var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}
this.wrapperStyle[durationProp] = utils.isBadAndroid ? '0.0001ms' : '0ms';
// remove 0.0001ms
var self = this;
Expand Down Expand Up @@ -1877,8 +1901,15 @@ Indicator.prototype = {
},

transitionTime: function (time) {
if (!this.options.useTransition) {
return;
}
time = time || 0;
var durationProp = utils.style.transitionDuration;
if(!durationProp) {
return;
}

this.indicatorStyle[durationProp] = time + 'ms';

if ( !time && utils.isBadAndroid ) {
Expand Down

0 comments on commit 2c95176

Please sign in to comment.