Use $.noConflict in profiler to allow multiple jQuery versions.

Signed-off-by: Dan Rogers <dan.rogers@bkwld.com>
This commit is contained in:
Dan Rogers
2013-01-03 15:04:45 -08:00
parent f4dd93ad67
commit 4e8b452b66
2 changed files with 29 additions and 30 deletions

View File

@@ -119,10 +119,6 @@
</ul>
</div>
@if (Config::get('application.profiler_js_src'))
<script>{{ file_get_contents(Config::get('application.profiler_js_src')) }}</script>
@else
<script>window.jQuery || document.write("<script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'>\x3C/script>")</script>
<script>{{ file_get_contents(path('sys').'profiling/profiler.js') }}</script>
@endif
<script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>
<script>{{ file_get_contents(path('sys').'profiling/profiler.js') }}</script>
<!-- /ANBU - LARAVEL PROFILER -->