update v1.0.7.9 R.C.

This is a Release Candidate. We are still testing.

vendor/barryvdh/laravel-debugbar/src/JavascriptRenderer.php

@@ -0,0 +1,122 @@
+<?php namespace Barryvdh\Debugbar;
+
+use DebugBar\DebugBar;
+use DebugBar\JavascriptRenderer as BaseJavascriptRenderer;
+use Illuminate\Routing\UrlGenerator;
+
+/**
+ * {@inheritdoc}
+ */
+class JavascriptRenderer extends BaseJavascriptRenderer
+{
+    // Use XHR handler by default, instead of jQuery
+    protected $ajaxHandlerBindToJquery = false;
+    protected $ajaxHandlerBindToXHR = true;
+
+    public function __construct(DebugBar $debugBar, $baseUrl = null, $basePath = null)
+    {
+        parent::__construct($debugBar, $baseUrl, $basePath);
+
+        $this->cssFiles['laravel'] = __DIR__ . '/Resources/laravel-debugbar.css';
+        $this->cssVendors['fontawesome'] = __DIR__ . '/Resources/vendor/font-awesome/style.css';
+    }
+
+    /**
+     * Set the URL Generator
+     *
+     * @param \Illuminate\Routing\UrlGenerator $url
+     * @deprecated
+     */
+    public function setUrlGenerator($url)
+    {
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function renderHead()
+    {
+        $cssRoute = route('debugbar.assets.css', [
+            'v' => $this->getModifiedTime('css')
+        ]);
+
+        $jsRoute = route('debugbar.assets.js', [
+            'v' => $this->getModifiedTime('js')
+       ]);
+
+        $html  = "<link rel='stylesheet' type='text/css' href='{$cssRoute}'>";
+        $html .= "<script type='text/javascript' src='{$jsRoute}'></script>";
+
+        if ($this->isJqueryNoConflictEnabled()) {
+            $html .= '<script type="text/javascript">jQuery.noConflict(true);</script>' . "\n";
+        }
+
+        return $html;
+    }
+
+    /**
+     * Get the last modified time of any assets.
+     *
+     * @param string $type 'js' or 'css'
+     * @return int
+     */
+    protected function getModifiedTime($type)
+    {
+        $files = $this->getAssets($type);
+
+        $latest = 0;
+        foreach ($files as $file) {
+            $mtime = filemtime($file);
+            if ($mtime > $latest) {
+                $latest = $mtime;
+            }
+        }
+        return $latest;
+    }
+
+    /**
+     * Return assets as a string
+     *
+     * @param string $type 'js' or 'css'
+     * @return string
+     */
+    public function dumpAssetsToString($type)
+    {
+        $files = $this->getAssets($type);
+
+        $content = '';
+        foreach ($files as $file) {
+            $content .= file_get_contents($file) . "\n";
+        }
+
+        return $content;
+    }
+
+    /**
+     * Makes a URI relative to another
+     *
+     * @param string|array $uri
+     * @param string $root
+     * @return string
+     */
+    protected function makeUriRelativeTo($uri, $root)
+    {
+        if (!$root) {
+            return $uri;
+        }
+
+        if (is_array($uri)) {
+            $uris = array();
+            foreach ($uri as $u) {
+                $uris[] = $this->makeUriRelativeTo($u, $root);
+            }
+            return $uris;
+        }
+
+        if (substr($uri, 0, 1) === '/' || preg_match('/^([a-zA-Z]+:\/\/|[a-zA-Z]:\/|[a-zA-Z]:\\\)/', $uri)) {
+            return $uri;
+        }
+        return rtrim($root, '/') . "/$uri";
+    }
+}