projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #230 from clocksmith/master
[dygraphs.git]
/
dygraph-utils.js
diff --git
a/dygraph-utils.js
b/dygraph-utils.js
index
aee272c
..
11a2fba
100644
(file)
--- a/
dygraph-utils.js
+++ b/
dygraph-utils.js
@@
-76,18
+76,28
@@
Dygraph.log = function(severity, message) {
}
if (typeof(window.console) != 'undefined') {
}
if (typeof(window.console) != 'undefined') {
+ // In older versions of Firefox, only console.log is defined.
+ var console = window.console;
+ var log = function(console, method, msg) {
+ if (method) {
+ method.call(console, msg);
+ } else {
+ console.log(msg);
+ }
+ };
+
switch (severity) {
case Dygraph.DEBUG:
switch (severity) {
case Dygraph.DEBUG:
-
window.console.debug(
'dygraphs: ' + message);
+
log(console, console.debug,
'dygraphs: ' + message);
break;
case Dygraph.INFO:
break;
case Dygraph.INFO:
-
window.console.info(
'dygraphs: ' + message);
+
log(console, console.info,
'dygraphs: ' + message);
break;
case Dygraph.WARNING:
break;
case Dygraph.WARNING:
-
window.console.warn(
'dygraphs: ' + message);
+
log(console, console.warn,
'dygraphs: ' + message);
break;
case Dygraph.ERROR:
break;
case Dygraph.ERROR:
-
window.console.error(
'dygraphs: ' + message);
+
log(console, console.error,
'dygraphs: ' + message);
break;
}
}
break;
}
}
@@
-291,7
+301,11
@@
Dygraph.findPosX = function(obj) {
if(obj.offsetParent) {
var copyObj = obj;
while(1) {
if(obj.offsetParent) {
var copyObj = obj;
while(1) {
- var borderLeft = getComputedStyle(copyObj).borderLeft || "0";
+ // NOTE: the if statement here is for IE8.
+ var borderLeft = "0";
+ if (window.getComputedStyle) {
+ borderLeft = window.getComputedStyle(copyObj, null).borderLeft || "0";
+ }
curleft += parseInt(borderLeft, 10) ;
curleft += copyObj.offsetLeft;
if(!copyObj.offsetParent) {
curleft += parseInt(borderLeft, 10) ;
curleft += copyObj.offsetLeft;
if(!copyObj.offsetParent) {
@@
-324,7
+338,11
@@
Dygraph.findPosY = function(obj) {
if(obj.offsetParent) {
var copyObj = obj;
while(1) {
if(obj.offsetParent) {
var copyObj = obj;
while(1) {
- var borderTop = getComputedStyle(copyObj).borderTop || "0";
+ // NOTE: the if statement here is for IE8.
+ var borderTop = "0";
+ if (window.getComputedStyle) {
+ borderTop = window.getComputedStyle(copyObj, null).borderTop || "0";
+ }
curtop += parseInt(borderTop, 10) ;
curtop += copyObj.offsetTop;
if(!copyObj.offsetParent) {
curtop += parseInt(borderTop, 10) ;
curtop += copyObj.offsetTop;
if(!copyObj.offsetParent) {