deac
/
fullcalendar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calendar.js: Allow the use of height: 'auto' to remove the Agenda ScrollBar. Fixed #521 - Can't Remove Agenda ScrollBar

master
FagnerMartinsBrack 2011-06-27 08:22:40 -07:00
parent 7fc1e166c5
commit 5044683aec
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Calendar.js
View File

@ -1,4 +1,3 @@
function Calendar(element, options, eventSources) {
var t = this;
@ -262,11 +261,13 @@ function Calendar(element, options, eventSources) {
function calcSize() {
if (options.contentHeight) {
suggestedViewHeight = options.contentHeight;
}
else if (options.height) {
suggestedViewHeight = options.height - (headerElement ? headerElement.height() : 0) - vsides(content);
}
else {
} else if (options.height) {
if(options.height.toString().match(new RegExp("^[0-9]+(px)?$"))) {
suggestedViewHeight = parseInt(options.height) - (headerElement ? headerElement.height() : 0) - vsides(content);
} else {
suggestedViewHeight = options.height;
}
} else {
suggestedViewHeight = Math.round(content.width() / Math.max(options.aspectRatio, .5));
}
}