Skip to content

Commit 288bb77

Browse files
committed
[patch] Update patches for Engine.IO client to make them apply cleanly
1 parent e28713c commit 288bb77

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/transformers/engine.io/library.js b/transformers/engine.io/library.js
2-
index 4711309..3200bc9 100644
2+
index 03777a9..ae51096 100644
33
--- a/transformers/engine.io/library.js
44
+++ b/transformers/engine.io/library.js
5-
@@ -2188,7 +2188,7 @@ module.exports = function(opts) {
5+
@@ -2177,7 +2177,7 @@ module.exports = function (opts) {
66

77
if (!xdomain) {
88
try {
99
- return new ActiveXObject('Microsoft.XMLHTTP');
1010
+ return new window[(['Active'].concat('Object').join('X'))]('Microsoft.XMLHTTP');
11-
} catch(e) { }
11+
} catch (e) { }
1212
}
13-
}
13+
};

transformers/engine.io/patches/defer.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/transformers/engine.io/library.js b/transformers/engine.io/library.js
2-
index 3200bc9..aa46cec 100644
2+
index ae51096..4533d10 100644
33
--- a/transformers/engine.io/library.js
44
+++ b/transformers/engine.io/library.js
5-
@@ -2004,23 +2004,6 @@ WS.prototype.addEventListeners = function(){
5+
@@ -1989,23 +1989,6 @@ WS.prototype.addEventListeners = function () {
66
};
77

88
/**
@@ -12,11 +12,11 @@ index 3200bc9..aa46cec 100644
1212
- * @api private
1313
- */
1414
-
15-
-if ('undefined' != typeof navigator
16-
- && /iPad|iPhone|iPod/i.test(navigator.userAgent)) {
17-
- WS.prototype.onData = function(data){
15+
-if ('undefined' !== typeof navigator &&
16+
- /iPad|iPhone|iPod/i.test(navigator.userAgent)) {
17+
- WS.prototype.onData = function (data) {
1818
- var self = this;
19-
- setTimeout(function(){
19+
- setTimeout(function () {
2020
- Transport.prototype.onData.call(self, data);
2121
- }, 0);
2222
- };
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/transformers/engine.io/library.js b/transformers/engine.io/library.js
2-
index aa46cec..4df3e76 100644
2+
index 4533d10..51582e6 100644
33
--- a/transformers/engine.io/library.js
44
+++ b/transformers/engine.io/library.js
5-
@@ -4120,17 +4120,7 @@ module.exports = function parseuri(str) {
6-
'decode': utf8decode
5+
@@ -4119,17 +4119,7 @@ module.exports = function parseuri(str) {
6+
'decode': wtf8decode
77
};
88

99
- // Some AMD build optimizers, like r.js, check for specific condition patterns
@@ -14,10 +14,10 @@ index aa46cec..4df3e76 100644
1414
- define.amd
1515
- ) {
1616
- define(function() {
17-
- return utf8;
17+
- return wtf8;
1818
- });
1919
- } else if (freeExports && !freeExports.nodeType) {
2020
+ if (freeExports && !freeExports.nodeType) {
2121
if (freeModule) { // in Node.js or RingoJS v0.8.0+
22-
freeModule.exports = utf8;
22+
freeModule.exports = wtf8;
2323
} else { // in Narwhal or RingoJS v0.7.0-

0 commit comments

Comments
 (0)