dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #333 from ilvalle/create_view

Browse Source 
fix issue 1825
This commit is contained in:
mdipierro
2013-12-19 20:29:10 -08:00
parent 53f4408652 d72d5c64e2
commit 67c35e5327
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/js/web2py_bootstrap.js
+3 -3
View File
@@ -20,14 +20,14 @@ jQuery(function(){
function hoverMenu(){ function hoverMenu(){
jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){ jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
adjust_height_of_collapsed_nav(); adjust_height_of_collapsed_nav();
mi = jQuery(this).addClass('open'); var mi = jQuery(this).addClass('open');
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
}, function(){ }, function(){
mi = jQuery(this); var mi = jQuery(this);
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')}); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
}); });
} }
hoverMenu(); // first page load hoverMenu(); // first page load
jQuery(window).resize(hoverMenu); // on resize event jQuery(window).resize(hoverMenu); // on resize event
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');}); jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
}); });
applications/examples/static/js/web2py_bootstrap.js
+3 -3
View File
@@ -20,14 +20,14 @@ jQuery(function(){
function hoverMenu(){ function hoverMenu(){
jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){ jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
adjust_height_of_collapsed_nav(); adjust_height_of_collapsed_nav();
mi = jQuery(this).addClass('open'); var mi = jQuery(this).addClass('open');
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
}, function(){ }, function(){
mi = jQuery(this); var mi = jQuery(this);
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')}); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
}); });
} }
hoverMenu(); // first page load hoverMenu(); // first page load
jQuery(window).resize(hoverMenu); // on resize event jQuery(window).resize(hoverMenu); // on resize event
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');}); jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
}); });
applications/welcome/static/js/web2py_bootstrap.js
+3 -3
View File
@@ -20,14 +20,14 @@ jQuery(function(){
function hoverMenu(){ function hoverMenu(){
jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){ jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
adjust_height_of_collapsed_nav(); adjust_height_of_collapsed_nav();
mi = jQuery(this).addClass('open'); var mi = jQuery(this).addClass('open');
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
}, function(){ }, function(){
mi = jQuery(this); var mi = jQuery(this);
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')}); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
}); });
} }
hoverMenu(); // first page load hoverMenu(); // first page load
jQuery(window).resize(hoverMenu); // on resize event jQuery(window).resize(hoverMenu); // on resize event
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');}); jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
}); });