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 #67 from kberg/master
[dygraphs.git]
/
tests
/
labelsKMB.html
diff --git
a/tests/labelsKMB.html
b/tests/labelsKMB.html
index
760411b
..
7f3b361
100644
(file)
--- a/
tests/labelsKMB.html
+++ b/
tests/labelsKMB.html
@@
-1,12
+1,17
@@
+<!DOCTYPE html>
<html>
<head>
<html>
<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
<title>labelsKMB</title>
<!--[if IE]>
<title>labelsKMB</title>
<!--[if IE]>
- <script type="text/javascript" src="excanvas.js"></script>
+ <script type="text/javascript" src="
../
excanvas.js"></script>
<![endif]-->
<![endif]-->
- <script type="text/javascript" src="../dygraph-combined.js"></script>
- <script type="text/javascript" src="../dygraph-canvas.js"></script>
- <script type="text/javascript" src="../dygraph.js"></script>
+ <!--
+ For production (minified) code, use:
+ <script type="text/javascript" src="dygraph-combined.js"></script>
+ -->
+ <script type="text/javascript" src="../dygraph-dev.js"></script>
+
</head>
<body>
<p>labelsKMB:</p>
</head>
<body>
<p>labelsKMB:</p>
@@
-22,6
+27,11
@@
'M', 'B', etc. labels.</p>
<script type="text/javascript">
'M', 'B', etc. labels.</p>
<script type="text/javascript">
+ function round(num, places) {
+ var shift = Math.pow(10, places);
+ return Math.round(num * shift)/shift;
+ };
+
var data = [];
for (var i = 0, n = 1; i < 43; i++, n *= 2) {
data.push([i, n]);
var data = [];
for (var i = 0, n = 1; i < 43; i++, n *= 2) {
data.push([i, n]);
@@
-34,7
+44,7
@@
var magnitude = Math.floor(String(Math.floor(v)).length / 3);
if (magnitude > suffixes.length - 1)
magnitude = suffixes.length - 1;
var magnitude = Math.floor(String(Math.floor(v)).length / 3);
if (magnitude > suffixes.length - 1)
magnitude = suffixes.length - 1;
- return String(
g.round_
(v / Math.pow(10, magnitude * 3), 2)) +
+ return String(
round
(v / Math.pow(10, magnitude * 3), 2)) +
suffixes[magnitude];
}
suffixes[magnitude];
}