morrisjs-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e6c7dea9af4ad673b2099893a2660870ab6a08
-  data.tar.gz: faf9927817aa156869084ff6670de11f0043fab4
+  metadata.gz: f923dc042465196b9c10b7f2c2852ec8a16a9aab
+  data.tar.gz: 76d995547a0bddd0547e4736da1b2fe4de130a6e
 SHA512:
-  metadata.gz: b4b2f994aa2b24003880404f4e5a4ee1bb33d90fae36341d2e2ae0665c1d993afffaf765e044f3823b5465468c10c4649c1c62f74e53f00f3d3a9b2ec277b13a
-  data.tar.gz: 0b4aaeddc989fefc7a28f718773eb724a5c5fbfa419704e81571cd73c4f484d42f6d03d005815e6962635e4761e37f7833b8c85f52dea4bcf7f9add8478029d6
+  metadata.gz: a1847bd076074917b41d5b7938a37cdd59e8a998181a92219c32f073b46c7765e9635b5b85d31611c6375d926de5af78b91eb6d11a9eb3ff6281aa8365cc23d7
+  data.tar.gz: 0020bbfcdf9e3024e1ae17d22122750520ec659d6e98b3d4aa14301939fb4af089f0e2a4bf75ad1a18f2eb3768840ba8797d41c9c8b61f32bb8dfd379b401098

data/lib/morrisjs-rails/version.rb

@@ -1,5 +1,5 @@
 module Morrisjs
   module Rails
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/vendor/assets/javascripts/morris.js

@@ -1,5 +1,5 @@
 /* @license
-morris.js v0.5.0
+morris.js v0.5.1
 Copyright 2014 Olly Smith All rights reserved.
 Licensed under the BSD-2-Clause License.
 */
@@ -127,8 +127,7 @@ Licensed under the BSD-2-Clause License.
         var offset, touch;
         touch = evt.originalEvent.touches[0] || evt.originalEvent.changedTouches[0];
         offset = _this.el.offset();
-        _this.fire('hover', touch.pageX - offset.left, touch.pageY - offset.top);
-        return touch;
+        return _this.fire('hovermove', touch.pageX - offset.left, touch.pageY - offset.top);
       });
       this.el.bind('click', function(evt) {
         var offset;
@@ -160,6 +159,7 @@ Licensed under the BSD-2-Clause License.
           return _this.timeoutId = window.setTimeout(_this.resizeHandler, 100);
         });
       }
+      this.el.css('-webkit-tap-highlight-color', 'rgba(0,0,0,0)');
       if (this.postInit) {
         this.postInit();
       }
@@ -663,9 +663,13 @@ Licensed under the BSD-2-Clause License.
     }
 
     Hover.prototype.update = function(html, x, y) {
-      this.html(html);
-      this.show();
-      return this.moveTo(x, y);
+      if (!html) {
+        return this.hide();
+      } else {
+        this.html(html);
+        this.show();
+        return this.moveTo(x, y);
+      }
     };
 
     Hover.prototype.html = function(content) {
@@ -744,7 +748,6 @@ Licensed under the BSD-2-Clause License.
       xLabels: 'auto',
       xLabelFormat: null,
       xLabelMargin: 24,
-      continuousLine: true,
       hideHover: false
     };
 
@@ -850,7 +853,7 @@ Licensed under the BSD-2-Clause License.
     };
 
     Line.prototype.generatePaths = function() {
-      var c, coords, i, r, smooth;
+      var coords, i, r, smooth;
       return this.paths = (function() {
         var _i, _ref, _ref1, _results;
         _results = [];
@@ -871,19 +874,6 @@ Licensed under the BSD-2-Clause License.
             }
             return _results1;
           }).call(this);
-          if (this.options.continuousLine) {
-            coords = (function() {
-              var _j, _len, _results1;
-              _results1 = [];
-              for (_j = 0, _len = coords.length; _j < _len; _j++) {
-                c = coords[_j];
-                if (c.y !== null) {
-                  _results1.push(c);
-                }
-              }
-              return _results1;
-            })();
-          }
           if (coords.length > 1) {
             _results.push(Morris.Line.createPath(coords, smooth, this.bottom));
           } else {
@@ -1496,7 +1486,7 @@ Licensed under the BSD-2-Clause License.
     Bar.prototype.drawSeries = function() {
       var barWidth, bottom, groupWidth, idx, lastTop, left, leftPadding, numBars, row, sidx, size, spaceLeft, top, ypos, zeroPos;
       groupWidth = this.width / this.options.data.length;
-      numBars = this.options.stacked != null ? 1 : this.options.ykeys.length;
+      numBars = this.options.stacked ? 1 : this.options.ykeys.length;
       barWidth = (groupWidth * this.options.barSizeRatio - this.options.barGap * (numBars - 1)) / numBars;
       if (this.options.barSize) {
         barWidth = Math.min(barWidth, this.options.barSize);
@@ -1530,6 +1520,9 @@ Licensed under the BSD-2-Clause License.
                   left += sidx * (barWidth + this.options.barGap);
                 }
                 size = bottom - top;
+                if (this.options.verticalGridCondition && this.options.verticalGridCondition(row.x)) {
+                  this.drawBar(this.left + idx * groupWidth, this.top, groupWidth, Math.abs(this.top - this.bottom), this.options.verticalGridColor, this.options.verticalGridOpacity, this.options.barRadius);
+                }
                 if (this.options.stacked) {
                   top -= lastTop;
                 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morrisjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - beanie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties