fix #57

wendux · Jun 14, 2022 · 9efea44 · 9efea44
1 parent 505806a
commit 9efea44
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 28 deletions.
diff --git a/dist/ajaxhook.core.js b/dist/ajaxhook.core.js
@@ -89,7 +89,7 @@ exports.unHook = unHook;
  */
 
 // Save original XMLHttpRequest as _rxhr
-var realXhr = "_rxhr";
+var realXhr = "__xhr";
 
 var events = exports.events = ['load', 'loadend', 'timeout', 'error', 'readystatechange', 'abort'];
 

diff --git a/dist/ajaxhook.core.min.js b/dist/ajaxhook.core.min.js
diff --git a/dist/ajaxhook.core.min.js.map b/dist/ajaxhook.core.min.js.map
diff --git a/dist/ajaxhook.js b/dist/ajaxhook.js
@@ -89,7 +89,7 @@ exports.unHook = unHook;
  */
 
 // Save original XMLHttpRequest as _rxhr
-var realXhr = "_rxhr";
+var realXhr = "__xhr";
 
 var events = exports.events = ['load', 'loadend', 'timeout', 'error', 'readystatechange', 'abort'];
 
@@ -233,16 +233,15 @@ var eventLoad = _xhrHook.events[0],
                                       * source code: https://github.com/wendux/Ajax-hook
                                       */
 
-var singleton,
-    prototype = 'prototype';
+var prototype = 'prototype';
 
 function proxy(proxy, win) {
-  if (singleton) throw "Proxy already exists";
-  return singleton = new Proxy(proxy, win);
+  win = win || window;
+  if (win['__xhr']) throw "Ajax is already hooked.";
+  return proxyAjax(proxy, win);
 }
 
 function unProxy(win) {
-  singleton = null;
   (0, _xhrHook.unHook)(win);
 }
 
@@ -324,7 +323,7 @@ var ErrorHandler = makeHandler(function (error) {
   this.reject(error);
 });
 
-function Proxy(proxy, win) {
+function proxyAjax(proxy, win) {
   var onRequest = proxy.onRequest,
       onResponse = proxy.onResponse,
       onError = proxy.onError;

diff --git a/dist/ajaxhook.min.js b/dist/ajaxhook.min.js
diff --git a/dist/ajaxhook.min.js.map b/dist/ajaxhook.min.js.map
diff --git a/dist/ajaxhook.umd.js b/dist/ajaxhook.umd.js
@@ -99,7 +99,7 @@ exports.unHook = unHook;
  */
 
 // Save original XMLHttpRequest as _rxhr
-var realXhr = "_rxhr";
+var realXhr = "__xhr";
 
 var events = exports.events = ['load', 'loadend', 'timeout', 'error', 'readystatechange', 'abort'];
 
@@ -243,16 +243,15 @@ var eventLoad = _xhrHook.events[0],
                                       * source code: https://github.com/wendux/Ajax-hook
                                       */
 
-var singleton,
-    prototype = 'prototype';
+var prototype = 'prototype';
 
 function proxy(proxy, win) {
-  if (singleton) throw "Proxy already exists";
-  return singleton = new Proxy(proxy, win);
+  win = win || window;
+  if (win['__xhr']) throw "Ajax is already hooked.";
+  return proxyAjax(proxy, win);
 }
 
 function unProxy(win) {
-  singleton = null;
   (0, _xhrHook.unHook)(win);
 }
 
@@ -334,7 +333,7 @@ var ErrorHandler = makeHandler(function (error) {
   this.reject(error);
 });
 
-function Proxy(proxy, win) {
+function proxyAjax(proxy, win) {
   var onRequest = proxy.onRequest,
       onResponse = proxy.onResponse,
       onError = proxy.onError;