20
20
$ . ui . ready ( function ( ) {
21
21
22
22
if ( $ . os . ie ) return ; //ie has the menu at the bottom
23
-
23
+ var afui = $ ( "#afui" ) . get ( 0 ) ;
24
24
var elems = $ ( "#content, #header, #navbar" ) ;
25
25
var max = 0 ;
26
26
var slideOver = max / 3 ;
33
33
var asideWidth = $asideMenu . width ( ) ;
34
34
var inputElements = [ "input" , "select" , "textarea" ] ;
35
35
var tracking = false ;
36
- $ ( "#afui" ) . bind ( "touchstart" , function ( e ) {
36
+ var hasMoved = false ;
37
+ afui . addEventListener ( "touchstart" , function ( e ) {
37
38
openState = 0 ;
38
39
if ( ! $ . ui . isSideMenuEnabled ( ) && ! $ . ui . isAsideMenuEnabled ( ) ) return true ;
39
40
if ( e . touches . length > 1 ) return ;
65
66
openState = 2 ;
66
67
max = asideWidth ;
67
68
}
68
- } ) ;
69
+ } , true ) ;
70
+
71
+ afui . addEventListener ( "touchmove" , function ( e ) {
69
72
70
- $ ( "#afui" ) . bind ( "touchmove" , function ( e ) {
71
73
if ( e . touches . length > 1 || ! tracking ) return ;
72
74
if ( ! $ . ui . isSideMenuEnabled ( ) && ! $ . ui . isAsideMenuEnabled ( ) ) return true ;
73
75
if ( ! $ . ui . slideSideMenu || keepOpen ) return true ;
76
78
dy = e . touches [ 0 ] . pageY ;
77
79
78
80
//splitview stuff
81
+ if ( hasMoved ) {
82
+ e . preventDefault ( ) ;
83
+ e . stopPropagation ( ) ;
84
+ }
79
85
80
86
if ( $ . ui . splitview && window . innerWidth >= parseInt ( $ . ui . handheldMinWidth , 10 ) && ( dx > startX ) && openState === 0 ) return true ;
81
87
if ( ! $ . ui . isSideMenuEnabled ( ) && ( dx > startX ) && openState === 0 ) return true ;
82
- if ( ! $ . ui . isAsideMenuEnabled ( ) && ( dx < startX ) && openState === 0 ) return true ;
83
-
88
+ if ( ! $ . ui . isAsideMenuEnabled ( ) && ( dx < startX ) && openState === 0 ) return true ;
84
89
if ( Math . abs ( dy - startY ) > Math . abs ( dx - startX ) ) return true ;
85
90
86
91
if ( ! checking ) {
90
95
}
91
96
else
92
97
doMenu = true ;
93
-
94
98
var thePlace = ( dx - startX ) ;
95
99
if ( openState === 0 ) {
96
100
if ( thePlace < 0 ) {
104
108
$asideMenu . hide ( ) ;
105
109
}
106
110
}
107
- if ( Math . abs ( thePlace ) > max ) return true ;
108
111
112
+ if ( Math . abs ( thePlace ) > max ) {
113
+ return true ;
114
+ }
115
+
116
+ e . preventDefault ( ) ;
117
+ e . stopPropagation ( ) ;
109
118
slideOver = max / 3 ;
110
119
showHideThresh = Math . abs ( thePlace ) < slideOver ?showHide ?showHide :false :2 ;
111
120
134
143
} else {
135
144
isAside = false ;
136
145
}
146
+ hasMoved = true ;
137
147
elems . cssTranslate ( thePlace + "px,0" ) ;
138
- e . preventDefault ( ) ;
139
- e . stopPropagation ( ) ;
140
- } ) ;
141
- $ ( "# afui" ) . bind ( "touchend" , function ( e ) {
148
+
149
+
150
+ } , true ) ;
151
+ afui . addEventListener ( "touchend" , function ( e ) {
142
152
if ( ! $ . ui . isSideMenuEnabled ( ) && ! $ . ui . isAsideMenuEnabled ( ) ) return true ;
143
153
if ( doMenu && checking && ! keepOpen ) {
144
154
$ . ui . toggleSideMenu ( showHideThresh , function ( ) {
145
155
} , transTime , isAside ) ;
146
156
}
157
+ hasMoved = false ;
147
158
checking = false ;
148
159
doMenu = false ;
149
160
keepOpen = false ;
150
161
tracking = false ;
151
- } ) ;
162
+ } , true ) ;
152
163
} ) ;
153
164
} ) ( af ) ;
0 commit comments