OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.104, fix X_shortcut & etc.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
20_ui
/
15_ScrollBox.js
diff --git
a/0.6.x/js/20_ui/15_ScrollBox.js
b/0.6.x/js/20_ui/15_ScrollBox.js
index
a819447
..
14f8bbd
100644
(file)
--- a/
0.6.x/js/20_ui/15_ScrollBox.js
+++ b/
0.6.x/js/20_ui/15_ScrollBox.js
@@
-24,9
+24,9
@@
var m = Math,
// Scrollbar
\r
hScrollbar : true,
\r
vScrollbar : true,
\r
// Scrollbar
\r
hScrollbar : true,
\r
vScrollbar : true,
\r
- fixedScrollbar : X
.
UA.Android,
\r
- hideScrollbar : X
.
UA.iOS,
\r
- fadeScrollbar : X
.
UA.iOS, //&& has3d,
\r
+ fixedScrollbar : X
_
UA.Android,
\r
+ hideScrollbar : X
_
UA.iOS,
\r
+ fadeScrollbar : X
_
UA.iOS, //&& has3d,
\r
scrollbarClass : '',
\r
\r
// Zoom
\r
scrollbarClass : '',
\r
\r
// Zoom
\r
@@
-196,7
+196,7
@@
var m = Math,
// Helpers FIX ANDROID BUG!
\r
// translate3d and scale doesn't work together!
\r
// Ignoring 3d ONLY WHEN YOU SET this.options.zoom
\r
// Helpers FIX ANDROID BUG!
\r
// translate3d and scale doesn't work together!
\r
// Ignoring 3d ONLY WHEN YOU SET this.options.zoom
\r
- //if ( this.options.zoom && X
.
UA.isAndroid ){
\r
+ //if ( this.options.zoom && X
_
UA.isAndroid ){
\r
// translateZ = '';
\r
//}
\r
\r
// translateZ = '';
\r
//}
\r
\r
@@
-300,7
+300,7
@@
X_Class_override( iScroll.prototype, {
},
\r
\r
_resize: function () {
\r
},
\r
\r
_resize: function () {
\r
- X.Timer.once( X
.
UA.Android ? 200 : 0, this, this.refresh );
\r
+ X.Timer.once( X
_
UA.Android ? 200 : 0, this, this.refresh );
\r
// setTimeout( this.refresh(), isAndroid ? 200 : 0);
\r
},
\r
\r
// setTimeout( this.refresh(), isAndroid ? 200 : 0);
\r
},
\r
\r