|
@@ -71,7 +71,7 @@ function sliceSegs(events, visEventEnds, start, end) {
|
|
|
msLength: segEnd - segStart
|
|
msLength: segEnd - segStart
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
return segs.sort(segCmp);
|
|
return segs.sort(segCmp);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -155,29 +155,26 @@ function setOuterHeight(element, height, includeMargins) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
function hsides(element, includeMargins) {
|
|
function hsides(element, includeMargins) {
|
|
|
return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
|
|
return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
function hpadding(element) {
|
|
function hpadding(element) {
|
|
|
- return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
|
|
|
|
|
- (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
|
|
|
|
|
|
|
+ return (parseFloat($.css(element[0], 'paddingLeft', true)) || 0) +
|
|
|
|
|
+ (parseFloat($.css(element[0], 'paddingRight', true)) || 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
function hmargins(element) {
|
|
function hmargins(element) {
|
|
|
- return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
|
|
|
|
|
- (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
|
|
|
|
|
|
|
+ return (parseFloat($.css(element[0], 'marginLeft', true)) || 0) +
|
|
|
|
|
+ (parseFloat($.css(element[0], 'marginRight', true)) || 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
function hborders(element) {
|
|
function hborders(element) {
|
|
|
- return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
|
|
|
|
|
- (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
|
|
|
|
|
|
|
+ return (parseFloat($.css(element[0], 'borderLeftWidth', true)) || 0) +
|
|
|
|
|
+ (parseFloat($.css(element[0], 'borderRightWidth', true)) || 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -187,20 +184,20 @@ function vsides(element, includeMargins) {
|
|
|
|
|
|
|
|
|
|
|
|
|
function vpadding(element) {
|
|
function vpadding(element) {
|
|
|
- return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
|
|
|
|
|
- (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
|
|
|
|
|
|
|
+ return (parseFloat($.css(element[0], 'paddingTop', true)) || 0) +
|
|
|
|
|
+ (parseFloat($.css(element[0], 'paddingBottom', true)) || 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
function vmargins(element) {
|
|
function vmargins(element) {
|
|
|
- return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
|
|
|
|
|
- (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
|
|
|
|
|
|
|
+ return (parseFloat($.css(element[0], 'marginTop', true)) || 0) +
|
|
|
|
|
+ (parseFloat($.css(element[0], 'marginBottom', true)) || 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
function vborders(element) {
|
|
function vborders(element) {
|
|
|
- return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
|
|
|
|
|
- (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
|
|
|
|
|
|
|
+ return (parseFloat($.css(element[0], 'borderTopWidth', true)) || 0) +
|
|
|
|
|
+ (parseFloat($.css(element[0], 'borderBottomWidth', true)) || 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -368,4 +365,3 @@ function firstDefined() {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|