Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1561 from danro/develop 

Use $.noConflict in profiler to prevent conflicts in multiple versions of jQuery.
This commit is contained in:
Taylor Otwell 2013-01-05 11:06:49 -08:00
parent 1a33a13a3a 4e8b452b66
commit 5a89836f5d
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
laravel/profiling/profiler.js
View File

@ -1,4 +1,9 @@
var anbu = { var anbu = {
// Sandbox a jQuery instance for the profiler.
jq: jQuery.noConflict(true)
};
anbu.jq.extend(anbu, {
// BOUND ELEMENTS // BOUND ELEMENTS
// ------------------------------------------------------------- // -------------------------------------------------------------
@ -6,20 +11,20 @@ var anbu = {
// the DOM every time they are used. // the DOM every time they are used.
el: { el: {
main: jQuery('.anbu'), main: anbu.jq('.anbu'),
close: jQuery('#anbu-close'), close: anbu.jq('#anbu-close'),
zoom: jQuery('#anbu-zoom'), zoom: anbu.jq('#anbu-zoom'),
hide: jQuery('#anbu-hide'), hide: anbu.jq('#anbu-hide'),
show: jQuery('#anbu-show'), show: anbu.jq('#anbu-show'),
tab_pane: jQuery('.anbu-tab-pane'), tab_pane: anbu.jq('.anbu-tab-pane'),
hidden_tab_pane: jQuery('.anbu-tab-pane:visible'), hidden_tab_pane: anbu.jq('.anbu-tab-pane:visible'),
tab: jQuery('.anbu-tab'), tab: anbu.jq('.anbu-tab'),
tabs: jQuery('.anbu-tabs'), tabs: anbu.jq('.anbu-tabs'),
tab_links: jQuery('.anbu-tabs a'), tab_links: anbu.jq('.anbu-tabs a'),
window: jQuery('.anbu-window'), window: anbu.jq('.anbu-window'),
closed_tabs: jQuery('#anbu-closed-tabs'), closed_tabs: anbu.jq('#anbu-closed-tabs'),
open_tabs: jQuery('#anbu-open-tabs'), open_tabs: anbu.jq('#anbu-open-tabs'),
content_area: jQuery('.anbu-content-area') content_area: anbu.jq('.anbu-content-area')
}, },
// CLASS ATTRIBUTES // CLASS ATTRIBUTES
@ -30,7 +35,7 @@ var anbu = {
is_zoomed: false, is_zoomed: false,
// initial height of content area // initial height of content area
small_height: jQuery('.anbu-content-area').height(), small_height: anbu.jq('.anbu-content-area').height(),
// the name of the active tab css // the name of the active tab css
active_tab: 'anbu-active-tab', active_tab: 'anbu-active-tab',
@ -76,7 +81,7 @@ var anbu = {
event.preventDefault(); event.preventDefault();
}); });
anbu.el.tab.click(function(event) { anbu.el.tab.click(function(event) {
anbu.clicked_tab(jQuery(this)); anbu.clicked_tab(anbu.jq(this));
event.preventDefault(); event.preventDefault();
}); });
@ -104,8 +109,8 @@ var anbu = {
open_window: function(tab) { open_window: function(tab) {
// can't directly assign this line, but it works // can't directly assign this line, but it works
jQuery('.anbu-tab-pane:visible').fadeOut(200); anbu.jq('.anbu-tab-pane:visible').fadeOut(200);
jQuery('.' + tab.attr(anbu.tab_data)).delay(220).fadeIn(300); anbu.jq('.' + tab.attr(anbu.tab_data)).delay(220).fadeIn(300);
anbu.el.tab_links.removeClass(anbu.active_tab); anbu.el.tab_links.removeClass(anbu.active_tab);
tab.addClass(anbu.active_tab); tab.addClass(anbu.active_tab);
anbu.el.window.slideDown(300); anbu.el.window.slideDown(300);
@ -172,13 +177,13 @@ var anbu = {
// Toggle the zoomed mode of the top window. // Toggle the zoomed mode of the top window.
zoom: function() { zoom: function() {
var height;
if (anbu.is_zoomed) { if (anbu.is_zoomed) {
height = anbu.small_height; height = anbu.small_height;
anbu.is_zoomed = false; anbu.is_zoomed = false;
} else { } else {
// the 6px is padding on the top of the window // the 6px is padding on the top of the window
height = (jQuery(window).height() - anbu.el.tabs.height() - 6) + 'px'; height = (anbu.jq(window).height() - anbu.el.tabs.height() - 6) + 'px';
anbu.is_zoomed = true; anbu.is_zoomed = true;
} }
@ -186,9 +191,7 @@ var anbu = {
} }
}; });
// launch anbu on jquery dom ready // launch anbu on jquery dom ready
jQuery(document).ready(function() { anbu.jq(anbu.start);
anbu.start();
});

2
laravel/profiling/template.blade.php
View File

@ -119,6 +119,6 @@
</ul> </ul>
</div> </div>
<script>window.jQuery || document.write("<script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'>\x3C/script>")</script> <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> <script>{{ file_get_contents(path('sys').'profiling/profiler.js') }}</script>
<!-- /ANBU - LARAVEL PROFILER --> <!-- /ANBU - LARAVEL PROFILER -->