removed dependency on jquery-drag

Author: maximebf

docs/javascript_bar.md

@@ -20,7 +20,8 @@ data from a data collector. Some common widgets are provided in
 the *widgets.js* file.
 
 The `PhpDebugBar` namespace is used for all objects and the only
-dependencies are *jQuery*, *jquery-drag* and *FontAwesome* (css).
+dependencies are *jQuery* and *FontAwesome* (css). *FontAwesome* is
+optional but is used to add nice icons!
 
 The main class is `PhpDebugBar.DebugBar`. It provides the infrastructure
 to manage tabs, indicators and datasets.

src/DebugBar/JavascriptRenderer.php

@@ -31,7 +31,7 @@ class JavascriptRenderer
 
     protected $cssVendors = array('vendor/font-awesome/css/font-awesome.css');
 
-    protected $jsVendors = array('vendor/jquery-1.8.3.min.js', 'vendor/jquery.event.drag-2.2.js');
+    protected $jsVendors = array('vendor/jquery-1.8.3.min.js');
 
     protected $includeVendors = true;
 
@@ -116,11 +116,17 @@ public function getBaseUrl()
 
     /**
      * Whether to include vendor assets
+     *
+     * You can only include js or css vendors using
+     * setIncludeVendors('css') or setIncludeVendors('js')
      * 
      * @param boolean $enabled
      */
     public function setIncludeVendors($enabled = true)
     {
+        if (is_string($enabled)) {
+            $enabled = array($enabled);
+        }
         $this->includeVendors = $enabled;
         return $this;
     }
@@ -132,7 +138,7 @@ public function setIncludeVendors($enabled = true)
      */
     public function areVendorsIncluded()
     {
-        return $this->includeVendors;
+        return $this->includeVendors !== false;
     }
 
     /**
@@ -260,9 +266,13 @@ protected function getAssetFiles($type = null)
         $cssFiles = $this->cssFiles;
         $jsFiles = $this->jsFiles;
 
-        if ($this->includeVendors) {
-            $cssFiles = array_merge($this->cssVendors, $cssFiles);
-            $jsFiles = array_merge($this->jsVendors, $jsFiles);
+        if ($this->includeVendors !== false) {
+            if ($this->includeVendors === true || in_array('css', $this->includeVendors)) {
+                $cssFiles = array_merge($this->cssVendors, $cssFiles);
+            }
+            if ($this->includeVendors === true || in_array('js', $this->includeVendors)) {
+                $jsFiles = array_merge($this->jsVendors, $jsFiles);
+            }
         }
 
         return $this->filterAssetArray(array($cssFiles, $jsFiles), $type);

src/DebugBar/Resources/debugbar.js

@@ -305,17 +305,27 @@ if (typeof(localStorage) == 'undefined') {
             var self = this;
             this.$el.appendTo('body');
             this.$header = $('<div class="phpdebugbar-header" />').appendTo(this.$el);
-            this.$body = $('<div class="phpdebugbar-body" />').appendTo(this.$el);
+            var $body = this.$body = $('<div class="phpdebugbar-body" />').appendTo(this.$el);
             this.$resizehdle = $('<div class="phpdebugbar-resize-handle" />').appendTo(this.$body);
 
-            // allow resizing by dragging handle
-            this.$body.drag('start', function(e, dd) {
-                dd.height = $(this).height();
-            }).drag(function(e, dd) {
-                var h = Math.max(100, dd.height - dd.deltaY);
-                $(this).css('height', h);
-                localStorage.setItem('phpdebugbar-height', h);
-            }, {handle: '.phpdebugbar-resize-handle'});
+            // dragging of resize handle
+            var dragging = false;
+            this.$resizehdle.on('mousedown', function(e) {
+                var orig_h = $body.height(), pos_y = e.pageY;
+                dragging = true;
+
+                $body.parents().on('mousemove', function(e) {
+                    if (dragging) {
+                        var h = orig_h + (pos_y - e.pageY);
+                        $body.css('height', h);
+                        localStorage.setItem('phpdebugbar-height', h);
+                    }
+                }).on('mouseup', function() {
+                    dragging = false;
+                });
+
+                e.preventDefault();
+            });
 
             // minimize button
             this.$minimizebtn = $('<a class="phpdebugbar-minimize-btn" href="javascript:"><i class="icon-remove"></i></a>').appendTo(this.$header);