bar.js: monkey patching getResponseHeader() & getAllResponseHeaders()…

… replaced with addEventListener()
kratkyzobak · Jan 4, 2017 · 1357d9a · 1357d9a
1 parent 25d5f74
commit 1357d9a
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/src/Tracy/assets/Bar/bar.js b/src/Tracy/assets/Bar/bar.js
@@ -379,31 +379,19 @@
 		if (!header) {
 			return;
 		}
-		var oldOpen = XMLHttpRequest.prototype.open,
-			oldGet = XMLHttpRequest.prototype.getResponseHeader,
-			oldGetAll = XMLHttpRequest.prototype.getAllResponseHeaders;
+		var oldOpen = XMLHttpRequest.prototype.open;
 
 		XMLHttpRequest.prototype.open = function() {
 			oldOpen.apply(this, arguments);
 			if (window.TracyAutoRefresh !== false && arguments[1].indexOf('//') <= 0 || arguments[1].indexOf(location.origin + '/') === 0) {
 				this.setRequestHeader('X-Tracy-Ajax', header);
+				this.addEventListener('load', function() {
+					if (this.getAllResponseHeaders().match(/^X-Tracy-Ajax: 1/mi)) {
+						Debug.loadScript('?_tracy_bar=content-ajax.' + header + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
+					}
+				});
 			}
 		};
-		XMLHttpRequest.prototype.getResponseHeader = function() {
-			process(this);
-			return oldGet.apply(this, arguments);
-		};
-		XMLHttpRequest.prototype.getAllResponseHeaders = function() {
-			process(this);
-			return oldGetAll.call(this);
-		};
-		function process(xhr) {
-			xhr.getResponseHeader = oldGet;
-			xhr.getAllResponseHeaders = oldGetAll;
-			if (xhr.getAllResponseHeaders().match(/^X-Tracy-Ajax: 1/mi)) {
-				Debug.loadScript('?_tracy_bar=content-ajax.' + header + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
-			}
-		}
 	};
 
 	Debug.loadScript = function(url) {