moved the call to jquery.noConflict() to the head rather than when calling render() (fixed php-debugbar#127)

Author: maximebf

src/DebugBar/JavascriptRenderer.php

@@ -712,6 +712,10 @@ public function renderHead()
             $html .= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $file);
         }
 
+        if ($this->enableJqueryNoConflict) {
+            $html .= '<script type="text/javascript">jQuery.noConflict(true);</script>' . "\n";
+        }
+
         return $html;
     }
 
@@ -803,10 +807,6 @@ protected function getJsInitializationCode()
     {
         $js = '';
 
-        if ($this->enableJqueryNoConflict) {
-            $js .= "jQuery.noConflict(true);\n";
-        }
-
         if (($this->initialization & self::INITIALIZE_CONSTRUCTOR) === self::INITIALIZE_CONSTRUCTOR) {
             $js .= sprintf("var %s = new %s();\n", $this->variableName, $this->javascriptClass);
         }

tests/DebugBar/Tests/JavascriptRendererTest.php

@@ -89,6 +89,11 @@ public function testRenderHead()
     {
         $html = $this->r->renderHead();
         $this->assertTag(array('tag' => 'script', 'attributes' => array('src' => '/burl/debugbar.js')), $html);
+        $this->assertTrue(strpos($html, "jQuery.noConflict(true);") > -1);
+
+        $this->r->setEnableJqueryNoConflict(false);
+        $html = $this->r->renderHead();
+        $this->assertFalse(strpos($html, "jQuery.noConflict(true);"));
     }
 
     public function testRenderFullInitialization()
@@ -105,8 +110,7 @@ public function testRenderConstructorOnly()
         $this->r->setJavascriptClass('Foobar');
         $this->r->setVariableName('foovar');
         $this->r->setAjaxHandlerClass(false);
-        $this->r->setEnableJqueryNoConflict(true);
-        $this->assertStringStartsWith("<script type=\"text/javascript\">\njQuery.noConflict(true);\nvar foovar = new Foobar();\nfoovar.addDataSet(", $this->r->render());
+        $this->assertStringStartsWith("<script type=\"text/javascript\">\nvar foovar = new Foobar();\nfoovar.addDataSet(", $this->r->render());
     }
 
     public function testJQueryNoConflictAutoDisabling()

tests/DebugBar/Tests/full_init.html

@@ -1,5 +1,4 @@
 <script type="text/javascript">
-jQuery.noConflict(true);
 var phpdebugbar = new PhpDebugBar.DebugBar();
 phpdebugbar.addTab("messages", new PhpDebugBar.DebugBar.Tab({"icon":"list-alt","title":"Messages", "widget": new PhpDebugBar.Widgets.MessagesWidget()}));
 phpdebugbar.addIndicator("time", new PhpDebugBar.DebugBar.Indicator({"icon":"time"}), "right");