File tree 3 files changed +21
-7
lines changed
3 files changed +21
-7
lines changed Original file line number Diff line number Diff line change 10
10
var IOS = 'ios' ;
11
11
var ANDROID = 'android' ;
12
12
var WINDOWS_PHONE = 'windowsphone' ;
13
+ var EDGE = 'edge' ;
13
14
var requestAnimationFrame = ionic . requestAnimationFrame ;
14
15
15
16
/**
229
230
isWindowsPhone : function ( ) {
230
231
return self . is ( WINDOWS_PHONE ) ;
231
232
} ,
233
+ /**
234
+ * @ngdoc method
235
+ * @name ionic.Platform#isEdge
236
+ * @returns {boolean } Whether we are running on MS Edge/Windows 10 (inc. Phone)
237
+ */
238
+ isEdge : function ( ) {
239
+ return self . is ( EDGE ) ;
240
+ } ,
232
241
233
242
/**
234
243
* @ngdoc method
249
258
platformName = n . toLowerCase ( ) ;
250
259
} else if ( getParameterByName ( 'ionicplatform' ) ) {
251
260
platformName = getParameterByName ( 'ionicplatform' ) ;
261
+ } else if ( self . ua . indexOf ( 'Edge' ) > - 1 ) {
262
+ platformName = EDGE ;
252
263
} else if ( self . ua . indexOf ( 'Windows Phone' ) > - 1 ) {
253
264
platformName = WINDOWS_PHONE ;
254
265
} else if ( self . ua . indexOf ( 'Android' ) > 0 ) {
Original file line number Diff line number Diff line change @@ -361,7 +361,8 @@ function tapMouseDown(e) {
361
361
console . log ( 'mousedown' , 'stop event' ) ;
362
362
e . stopPropagation ( ) ;
363
363
364
- if ( ( ! ionic . tap . isTextInput ( e . target ) || tapLastTouchTarget !== e . target ) && ! isSelectOrOption ( e . target . tagName ) && ! ionic . tap . isVideo ( e . target ) ) {
364
+ if ( ! ionic . Platform . isEdge ( ) && ( ! ionic . tap . isTextInput ( e . target ) || tapLastTouchTarget !== e . target ) &&
365
+ ! isSelectOrOption ( e . target . tagName ) && ! ionic . tap . isVideo ( e . target ) ) {
365
366
// If you preventDefault on a text input then you cannot move its text caret/cursor.
366
367
// Allow through only the text input default. However, without preventDefault on an
367
368
// input the 300ms delay can change focus on inputs after the keyboard shows up.
Original file line number Diff line number Diff line change 20
20
background-size : 99% $range-track-height ;
21
21
background-repeat : no-repeat ;
22
22
-webkit-appearance : none ;
23
-
23
+
24
24
& ::-moz-focus-outer {
25
25
/* hide the focus outline in Firefox */
26
- border : 0 ;
26
+ border : 0 ;
27
27
}
28
28
29
29
& ::-webkit-slider-thumb {
59
59
// background: red;
60
60
// opacity: .5;
61
61
}
62
+ & ::-ms-fill-lower {
63
+ height : $range-track-height ;
64
+ background :$dark ;
65
+ }
66
+ /*
62
67
&::-ms-track{
63
68
background: transparent;
64
69
border-color: transparent;
77
82
margin-right:1px;
78
83
outline:none;
79
84
}
80
- & ::-ms-fill-lower {
81
- height : $range-track-height ;
82
- background :$dark ;
83
- }
84
85
&::-ms-fill-upper {
85
86
height: $range-track-height;
86
87
background:$range-default-track-bg;
87
88
}
89
+ */
88
90
}
89
91
90
92
.range {
You can’t perform that action at this time.
0 commit comments