Permalink
Browse files

Merge branch '1.2.2'

  • Loading branch information...
2 parents de667c6 + c2bd420 commit 6b1a9ab68c7450ca25d8a0de9ef44da7eb645d32 @mbostock mbostock committed Jul 30, 2012
Showing with 6 additions and 6 deletions.
  1. +2 −2 cubism.v1.js
  2. +1 −1 cubism.v1.min.js
  3. +1 −1 package.json
  4. +1 −1 src/cubism.js
  5. +1 −1 src/graphite.js
View
@@ -1,5 +1,5 @@
(function(exports){
-var cubism = exports.cubism = {version: "1.2.1"};
+var cubism = exports.cubism = {version: "1.2.2"};
var cubism_id = 0;
function cubism_identity(d) { return d; }
cubism.option = function(name, defaultValue) {
@@ -198,7 +198,7 @@ cubism_contextPrototype.graphite = function(host) {
// Apply the summarize, if necessary.
if (step !== 1e4) target = "summarize(" + target + ",'"
- + (!(step % 36e5) ? step / 36e5 + "hour" : !(step % 6e4) ? step / 6e4 + "min" : step + "sec")
+ + (!(step % 36e5) ? step / 36e5 + "hour" : !(step % 6e4) ? step / 6e4 + "min" : step / 1e3 + "sec")
+ "','" + sum + "')";
d3.text(host + "/render?format=raw"
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "cubism",
- "version": "1.2.1",
+ "version": "1.2.2",
"description": "A JavaScript library for time series visualization.",
"keywords": [
"time series",
View
@@ -1 +1 @@
-var cubism = exports.cubism = {version: "1.2.1"};
+var cubism = exports.cubism = {version: "1.2.2"};
View
@@ -11,7 +11,7 @@ cubism_contextPrototype.graphite = function(host) {
// Apply the summarize, if necessary.
if (step !== 1e4) target = "summarize(" + target + ",'"
- + (!(step % 36e5) ? step / 36e5 + "hour" : !(step % 6e4) ? step / 6e4 + "min" : step + "sec")
+ + (!(step % 36e5) ? step / 36e5 + "hour" : !(step % 6e4) ? step / 6e4 + "min" : step / 1e3 + "sec")
+ "','" + sum + "')";
d3.text(host + "/render?format=raw"

0 comments on commit 6b1a9ab

Please sign in to comment.