= view.visEnd) { // !view.date means it hasn't been rendered yet
+ if (inc || !view.date || date < view.start || date >= view.end) { // !view.date means it hasn't been rendered yet
fixContentSize();
view.render(date, inc || 0, contentWidth, contentHeight, function(callback) {
// dont refetch if new view contains the same events (or a subset)
@@ -307,7 +307,7 @@ $.fn.fullCalendar = function(options) {
return options.contentHeight;
}
else if (options.height) {
- return options.height - (header ? header.height() : 0) - vsides(content);
+ return options.height - (header ? header.height() : 0) - vsides(content[0]);
}
return Math.round(contentWidth / Math.max(options.aspectRatio, .5));
}
diff --git a/src/util.js b/src/util.js
index f075e591a6..a633eb24ec 100644
--- a/src/util.js
+++ b/src/util.js
@@ -298,37 +298,42 @@ var dateFormatters = {
-----------------------------------------------------------------------------*/
function setOuterWidth(element, width, includeMargins) {
- element.each(function() {
- var e = $(this);
- e.width(width - hsides(e, includeMargins));
+ element.each(function(i, _element) {
+ _element.style.width = width - hsides(_element, includeMargins) + 'px';
});
}
-function hsides(e, includeMargins) {
- return (parseInt(e.css('border-left-width')) || 0) +
- (parseInt(e.css('padding-left')) || 0) +
- (parseInt(e.css('padding-right')) || 0) +
- (parseInt(e.css('border-right-width')) || 0) +
- (includeMargins ?
- (parseInt(e.css('margin-left')) || 0) + (parseInt(e.css('margin-right')) || 0)
- : 0);
-}
-
function setOuterHeight(element, height, includeMargins) {
- element.each(function() {
- var e = $(this);
- e.height(height - vsides(e, includeMargins));
+ element.each(function(i, _element) {
+ _element.style.height = height - vsides(_element, includeMargins) + 'px';
});
}
-function vsides(e, includeMargins) {
- return (parseInt(e.css('border-top-width')) || 0) +
- (parseInt(e.css('padding-top')) || 0) +
- (parseInt(e.css('padding-bottom')) || 0) +
- (parseInt(e.css('border-bottom-width')) || 0) +
- (includeMargins ?
- (parseInt(e.css('margin-top')) || 0) + (parseInt(e.css('margin-bottom')) || 0)
- : 0);
+
+function hsides(_element, includeMargins) {
+ return (parseFloat(jQuery.curCSS(_element, 'paddingLeft', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'paddingRight', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'borderLeftWidth', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'borderRightWidth', true)) || 0) +
+ (includeMargins ? hmargins(_element) : 0);
+}
+
+function hmargins(_element) {
+ return (parseFloat(jQuery.curCSS(_element, 'marginLeft', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'marginRight', true)) || 0);
+}
+
+function vsides(_element, includeMargins) {
+ return (parseFloat(jQuery.curCSS(_element, 'paddingTop', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'paddingBottom', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'borderTopWidth', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'borderBottomWidth', true)) || 0) +
+ (includeMargins ? vmargins(_element) : 0);
+}
+
+function vmargins(_element) {
+ return (parseFloat(jQuery.curCSS(_element, 'marginTop', true)) || 0) +
+ (parseFloat(jQuery.curCSS(_element, 'marginBottom', true)) || 0);
}
@@ -455,18 +460,6 @@ function htmlEscape(s) {
.replace(/"/g, '"')
}
-function eachLeaf(node, callback, leafIndex, indexTrail) {
- if (node.pop == arrayPop) { // is an array?
- for (var i=0, len=node.length; i").text(event.title);
+ return $("").text(event.title);
}
else if (event.id == 999) {
element.css('border-color', 'red');
//console.log('renderEvent (' + event.title + ') - ' + view.title);
}
},
-
eventAfterRender: function(event, element, view) {
//console.log('after render for "' + event.title + '":');
//console.log(element);
@@ -99,9 +98,9 @@
console.log(dayDelta + ' days');
console.log(minuteDelta + ' minutes');
console.log('allday: ' + allDay);
- /*setTimeout(function() {
- revertFunc();
- }, 2000);*/
+ //setTimeout(function() {
+ // revertFunc();
+ //}, 2000);
//console.log(jsEvent);
//console.log(ui);
//console.log(view.title);
@@ -120,9 +119,9 @@
console.log('RESIZE!! ' + event.title);
console.log(dayDelta + ' days');
console.log(minuteDelta + ' minutes');
- /*setTimeout(function() {
- revertFunc();
- }, 2000);*/
+ //setTimeout(function() {
+ // revertFunc();
+ //}, 2000);
//console.log(jsEvent);
//console.log(ui);
//console.log(view.title);
diff --git a/version.txt b/version.txt
index 428b770e3e..1c99cf0e80 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.4.3
+1.4.4