Skip to content

Commit ff93c76

Browse files
committed
Fixes jquery-archive#3041 — Cleans up the support test for Opera Mini and opts it out of fixed toolbar behavior.
1 parent b4eef42 commit ff93c76

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

js/jquery.mobile.forms.select.custom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
// fall into a black hole
322322
self.thisPage.unbind( "pagehide.remove" );
323323

324-
//for webos (set lastscroll using button offset)
324+
//for WebOS/Opera Mini (set lastscroll using button offset)
325325
if ( scrollTop == 0 && btnOffset > screenHeight ) {
326326
self.thisPage.one( "pagehide", function() {
327327
$( this ).jqmData( "lastScroll", btnOffset );

js/jquery.mobile.support.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var fakeBody = $( "<body>" ).prependTo( "html" ),
88
fbCSS = fakeBody[ 0 ].style,
99
vendors = [ "Webkit", "Moz", "O" ],
1010
webos = "palmGetResource" in window, //only used to rule out scrollTop
11+
operamini = window.operamini && ({}).toString.call( window.operamini ) === "[object OperaMini]",
1112
bb = window.blackberry; //only used to rule out box shadow, as it's filled opaque on BB
1213

1314
// thx Modernizr
@@ -70,7 +71,7 @@ $.extend( $.support, {
7071
cssPseudoElement: !!propExists( "content" ),
7172
touchOverflow: !!propExists( "overflowScrolling" ),
7273
boxShadow: !!propExists( "boxShadow" ) && !bb,
73-
scrollTop: ( "pageXOffset" in window || "scrollTop" in document.documentElement || "scrollTop" in fakeBody[ 0 ] ) && !webos,
74+
scrollTop: ( "pageXOffset" in window || "scrollTop" in document.documentElement || "scrollTop" in fakeBody[ 0 ] ) && !webos && !operamini,
7475
dynamicBaseTag: baseTagTest()
7576
});
7677

@@ -96,7 +97,7 @@ $.mobile.ajaxBlacklist =
9697
// BlackBerry browsers, pre-webkit
9798
window.blackberry && !window.WebKitPoint ||
9899
// Opera Mini
99-
window.operamini && Object.prototype.toString.call( window.operamini ) === "[object OperaMini]" ||
100+
operamini ||
100101
// Symbian webkits pre 7.3
101102
nokiaLTE7_3;
102103

0 commit comments

Comments
 (0)