kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge multiple jquery ready blocks

This commit is contained in:
Eric Davis 2011-10-28 14:48:38 -07:00
parent 923cdf3ff3
commit cbb99f81a1
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/javascripts/application.js
View File

@ -374,6 +374,13 @@ Event.observe(window, 'load', hideOnLoad);
var animationRate = 100; var animationRate = 100;
/* jQuery code from #263 */ /* jQuery code from #263 */
// returns viewport height
jQuery.viewportHeight = function() {
return self.innerHeight ||
jQuery.boxModel && document.documentElement.clientHeight ||
document.body.clientHeight;
};
/* TODO: integrate with existing code and/or refactor */ /* TODO: integrate with existing code and/or refactor */
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
@ -465,17 +472,6 @@ jQuery(document).ready(function($) {
return false; return false;
}); });
});
// returns viewport height
jQuery.viewportHeight = function() {
return self.innerHeight ||
jQuery.boxModel && document.documentElement.clientHeight ||
document.body.clientHeight;
};
jQuery(document).ready(function($) {
// header animation replacement - no animation, straight appear/hide // header animation replacement - no animation, straight appear/hide
$("#account .drop-down").unbind('mouseenter').unbind("mouseleave"); //remove the current animated handlers $("#account .drop-down").unbind('mouseenter').unbind("mouseleave"); //remove the current animated handlers
@ -551,6 +547,4 @@ jQuery(document).ready(function($) {
} }
}); });
}); });