Skip to content

Commit 6e93bcf

Browse files
committed
Remove IE10 support.
IE10 reached EOL a long time ago. Also, the usage of the features plugin: ./handlers/features!mspointer-events?... made loading the code via WebPack etc. problematic.
1 parent 56b8db1 commit 6e93bcf

File tree

7 files changed

+23
-37
lines changed

7 files changed

+23
-37
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This API is a shim of the [W3C Pointer Events specification][W3C_pointer] and ad
1212

1313
##Supported environments
1414
The API has been successfully tested on the following environments.
15+
1516
###Mobile
1617

1718
- Android 4.1.2+ (Stock browser and Chrome)
@@ -20,11 +21,15 @@ The API has been successfully tested on the following environments.
2021
- WindowsPhone 8.x
2122

2223
###Desktop
24+
2325
- Chrome (mouse)
2426
- FireFox (mouse + touchscreen)
25-
- IE10+ (mouse + touchscreen)
27+
- IE11 (mouse + touchscreen)
28+
- Edge (mouse)
29+
- Safari (mouse)
2630

2731
## Dependencies
32+
2833
This project can be integrated into any AMD capable javascript application.
2934

3035
## Installation

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dpointer",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"dependencies": {
55
"requirejs-dplugins": "0.6.x"
66
},

events.js

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ define([
55
"./handlers/features",
66
"./handlers/utils",
77
"./handlers/touch",
8-
"./handlers/mouse",
9-
"./handlers/features!mspointer-events?./handlers/mspointer"
10-
], function (has, utils, touch, mouse, mspointer) {
8+
"./handlers/mouse"
9+
], function (has, utils, touch, mouse) {
1110
"use strict";
1211

1312
var pointerEvents = {_targetElement: null};
@@ -25,14 +24,10 @@ define([
2524
return;// already initialized
2625
}
2726
if (!has("pointer-events")) {
28-
if (has("mspointer-events")) {
29-
mspointer.registerHandlers(targetElement);
27+
if (has("touch-events") && has("touch-device")) {
28+
touch.registerHandlers(targetElement);
3029
} else {
31-
if (has("touch-events") && has("touch-device")) {
32-
touch.registerHandlers(targetElement);
33-
} else {
34-
mouse.registerHandlers(targetElement);
35-
}
30+
mouse.registerHandlers(targetElement);
3631
}
3732
}
3833
this._targetElement = targetElement;
@@ -45,7 +40,6 @@ define([
4540
if (this._targetElement) {
4641
touch.deregisterHandlers(this._targetElement);
4742
mouse.deregisterHandlers(this._targetElement);
48-
mspointer && mspointer.deregisterHandlers(this._targetElement);
4943
}
5044
this._targetElement = null;
5145
};
@@ -77,14 +71,10 @@ define([
7771
if (has("pointer-events")) {
7872
return targetElement.setPointerCapture(pointerId);// use native Pointer Events method
7973
} else {
80-
if (has("mspointer-events")) {
81-
return targetElement.msSetPointerCapture(pointerId);// use native Pointer Events method
74+
if (pointerId === 1) { // mouse always gets ID = 1
75+
return mouse.setPointerCapture(targetElement);
8276
} else {
83-
if (pointerId === 1) { // mouse always gets ID = 1
84-
return mouse.setPointerCapture(targetElement);
85-
} else {
86-
return touch.setPointerCapture(targetElement, pointerId);
87-
}
77+
return touch.setPointerCapture(targetElement, pointerId);
8878
}
8979
}
9080
};
@@ -102,14 +92,10 @@ define([
10292
if (has("pointer-events")) {
10393
return targetElement.releasePointerCapture(pointerId);
10494
} else {
105-
if (has("mspointer-events")) {
106-
return targetElement.msReleasePointerCapture(pointerId);
95+
if (pointerId === 1) {
96+
return mouse.releasePointerCapture(targetElement);
10797
} else {
108-
if (pointerId === 1) {
109-
return mouse.releasePointerCapture(targetElement);
110-
} else {
111-
return touch.releasePointerCapture(targetElement, pointerId);
112-
}
98+
return touch.releasePointerCapture(targetElement, pointerId);
11399
}
114100
}
115101
};
@@ -136,10 +122,6 @@ define([
136122
insertTouchActionCSSRule("touch-action");
137123
}
138124

139-
// CSS rule for IE10 and IE11 preview
140-
if (has("mspointer-events")) {
141-
insertTouchActionCSSRule("-ms-touch-action");
142-
}
143125
// CSS rule to map CSS attribute in case user agent has native support for touch-action or -ms-touch-action
144126
// CSS property.
145127
if (has("css-touch-action")) {
@@ -155,4 +137,4 @@ define([
155137
pointerEvents.enable();
156138

157139
return pointerEvents;
158-
});
140+
});

handlers/features.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ define([
77
if (typeof document !== "undefined") {
88
has.add("touch-events", "ontouchstart" in document); // UA supports Touch Events
99
has.add("pointer-events", "onpointerdown" in document); // UA supports Pointer Events
10-
has.add("mspointer-events", "onmspointerdown" in document); // UA supports Pointer Events (IE10+IE11 preview)
1110
has.add("touch-device", /(mobile)|(android)/i.test(navigator.userAgent)); // mobile device
1211
has.add("css-touch-action", "touchAction" in document.body.style);// touch-action CSS
1312
has.add("css-ms-touch-action", "msTouchAction" in document.body.style);// -ms-touch-action CSS
1413
}
1514
return has;
16-
});
15+
});

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dpointer",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"devDependencies": {
55
"intern": "1.6.x",
66
"grunt": "~0.4.2",

tests/intern/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ define({
4040
reporters: ["console"],
4141

4242
excludeInstrumentation: /^(requirejs.*|dpointer\/tests)/
43-
});
43+
});

tests/intern/local.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ define([
3232
config.maxConcurrency = 1;
3333

3434
return config;
35-
});
35+
});

0 commit comments

Comments
 (0)