Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mui
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mui
Commits
8928bc0f
Commit
8928bc0f
authored
Nov 05, 2015
by
hbcui1984
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix:Android4.4.4上图片轮播受软键盘影响导致自动轮播停止
parent
35f839be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
js/mui.back.js
js/mui.back.js
+1
-0
js/mui.class.scroll.js
js/mui.class.scroll.js
+10
-1
No files found.
js/mui.back.js
View file @
8928bc0f
...
...
@@ -42,6 +42,7 @@
var
action
=
$
.
targets
.
action
;
if
(
action
&&
action
.
classList
.
contains
(
$
.
className
(
'
action-back
'
)))
{
$
.
back
();
$
.
targets
.
action
=
false
;
}
});
window
.
addEventListener
(
'
swiperight
'
,
function
(
e
)
{
...
...
js/mui.class.scroll.js
View file @
8928bc0f
...
...
@@ -258,6 +258,7 @@
this
.
_end
(
e
);
break
;
case
'
webkitTransitionEnd
'
:
this
.
transitionTimer
&&
this
.
transitionTimer
.
cancel
();
this
.
_transitionEnd
(
e
);
break
;
case
'
scrollend
'
:
...
...
@@ -506,6 +507,12 @@
this
.
indicators
[
i
].
transitionTime
(
time
);
}
}
if
(
time
)
{
//自定义timer,保证webkitTransitionEnd始终触发
this
.
transitionTimer
&&
this
.
transitionTimer
.
cancel
();
this
.
transitionTimer
=
$
.
later
(
function
()
{
$
.
trigger
(
this
.
scroller
,
'
webkitTransitionEnd
'
);
},
time
+
100
,
this
);
}
},
_transitionTimingFunction
:
function
(
easing
)
{
this
.
scrollerStyle
[
'
webkitTransitionTimingFunction
'
]
=
easing
;
...
...
@@ -702,7 +709,9 @@
},
scrollTo
:
function
(
x
,
y
,
time
,
easing
)
{
var
easing
=
easing
||
ease
.
circular
;
this
.
isInTransition
=
time
>
0
&&
(
this
.
lastX
!=
x
||
this
.
lastY
!=
y
);
// this.isInTransition = time > 0 && (this.lastX != x || this.lastY != y);
//暂不严格判断x,y,否则会导致部分版本上不正常触发轮播
this
.
isInTransition
=
time
>
0
;
if
(
this
.
isInTransition
)
{
this
.
_clearRequestAnimationFrame
();
this
.
_transitionTimingFunction
(
easing
.
style
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment