Merge pull request php-debugbar#167 from maximebf/xhrlistener

Add bindToXHR method

Author: barryvdh

src/DebugBar/JavascriptRenderer.php

@@ -69,6 +69,8 @@ class JavascriptRenderer
     protected $ajaxHandlerClass = 'PhpDebugBar.AjaxHandler';
 
     protected $ajaxHandlerBindToJquery = true;
+    
+    protected $ajaxHandlerBindToXHR = false;
 
     protected $openHandlerClass = 'PhpDebugBar.OpenHandler';
 
@@ -446,6 +448,27 @@ public function isAjaxHandlerBoundToJquery()
         return $this->ajaxHandlerBindToJquery;
     }
 
+    /**
+     * Sets whether to call bindToXHR() on the ajax handler
+     *
+     * @param boolean $bind
+     */
+    public function setBindAjaxHandlerToXHR($bind = true)
+    {
+        $this->ajaxHandlerBindToXHR = $bind;
+        return $this;
+    }
+
+    /**
+     * Checks whether bindToXHR() will be called on the ajax handler
+     *
+     * @return boolean
+     */
+    public function isAjaxHandlerBoundToXHR()
+    {
+        return $this->ajaxHandlerBindToXHR;
+    }
+    
     /**
      * Sets the class name of the js open handler
      *
@@ -817,7 +840,9 @@ protected function getJsInitializationCode()
 
         if ($this->ajaxHandlerClass) {
             $js .= sprintf("%s.ajaxHandler = new %s(%s);\n", $this->variableName, $this->ajaxHandlerClass, $this->variableName);
-            if ($this->ajaxHandlerBindToJquery) {
+            if ($this->ajaxHandlerBindToXHR) {
+                $js .= sprintf("%s.ajaxHandler.bindToXHR();\n", $this->variableName);
+            } else if ($this->ajaxHandlerBindToJquery) {
                 $js .= sprintf("if (jQuery) %s.ajaxHandler.bindToJquery(jQuery);\n", $this->variableName);
             }
         }

src/DebugBar/Resources/debugbar.js

@@ -1078,6 +1078,26 @@ if (typeof(PhpDebugBar) == 'undefined') {
                     self.handle(xhr);
                 }
             });
+        },
+        
+        /**
+         * Attaches an event listener to XMLHttpRequest
+         * 
+         * @this {AjaxHandler}
+         */
+        bindToXHR: function() {
+            var self = this;
+            var proxied = XMLHttpRequest.prototype.open;
+            XMLHttpRequest.prototype.open = function(method, url, async, user, pass) {
+                var xhr = this;
+                this.addEventListener("readystatechange", function() {
+                    var skipUrl = self.debugbar.openHandler ? self.debugbar.openHandler.get('url') : null;
+                    if (xhr.readyState == 4 && url.indexOf(skipUrl) !== 0) {
+                        self.handle(xhr);
+                    }
+                }, false);
+                proxied.apply(this, Array.prototype.slice.call(arguments));
+            };
         }
 
     });