projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://github.com/kberg/dygraphs
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
f736a7e
..
7384e71
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-189,10
+189,10
@@
Dygraph.prototype.__init__ = function(div, file, attrs) {
// If the div isn't already sized then inherit from our attrs or
// give it a default size.
if (div.style.width == '') {
// If the div isn't already sized then inherit from our attrs or
// give it a default size.
if (div.style.width == '') {
- div.style.width =
attrs.width || Dygraph.DEFAULT_WIDTH
+ "px";
+ div.style.width =
(attrs.width || Dygraph.DEFAULT_WIDTH)
+ "px";
}
if (div.style.height == '') {
}
if (div.style.height == '') {
- div.style.height =
attrs.height || Dygraph.DEFAULT_HEIGHT
+ "px";
+ div.style.height =
(attrs.height || Dygraph.DEFAULT_HEIGHT)
+ "px";
}
this.width_ = parseInt(div.style.width, 10);
this.height_ = parseInt(div.style.height, 10);
}
this.width_ = parseInt(div.style.width, 10);
this.height_ = parseInt(div.style.height, 10);