delete top if breaks

simbiotica · May 29, 2015 · a6d137f · a6d137f
1 parent 6115d0e
commit a6d137f
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/charicharts.js b/charicharts.js
@@ -551,6 +551,17 @@ var p_axes = PClass.extend({
       .attr('class', 'yaxis left')
       .call(model.axis);
 
+    // Remove last tick if touches the top axis
+    if (this.opts.xaxis.top.enabled) {
+      try {
+        var lastTick = _.last(model.el.selectAll('.tick')[0]);
+        var lastTickY = Number(lastTick.attributes.transform.textContent.match(/,(.*)\)$/)[1]);
+        if (lastTickY < 20) {
+          lastTick.remove();
+        }
+      } catch (e) {}
+    }
+
     this._renderYLabel('left');
   },
 

diff --git a/charicharts.min.js b/charicharts.min.js
diff --git a/demo/charicharts.js b/demo/charicharts.js
@@ -551,6 +551,17 @@ var p_axes = PClass.extend({
       .attr('class', 'yaxis left')
       .call(model.axis);
 
+    // Remove last tick if touches the top axis
+    if (this.opts.xaxis.top.enabled) {
+      try {
+        var lastTick = _.last(model.el.selectAll('.tick')[0]);
+        var lastTickY = Number(lastTick.attributes.transform.textContent.match(/,(.*)\)$/)[1]);
+        if (lastTickY < 20) {
+          lastTick.remove();
+        }
+      } catch (e) {}
+    }
+
     this._renderYLabel('left');
   },
 

diff --git a/demo/simple-chart-date.html b/demo/simple-chart-date.html
@@ -9,6 +9,7 @@
   }
   svg,
   body {
+    margin-top: 20px;
     background: white;
   }
   text {
@@ -70,7 +71,7 @@
 
 var options = {
   target: d3.select('body').node(),
-  margin: '60 10 25 30',
+  margin: '100 10 25 30',
   yaxis: {
     fit: true,
     textMarginTop: -10,

diff --git a/src/parts/axes.js b/src/parts/axes.js
@@ -154,6 +154,17 @@ var p_axes = PClass.extend({
       .attr('class', 'yaxis left')
       .call(model.axis);
 
+    // Remove last tick if touches the top axis
+    if (this.opts.xaxis.top.enabled) {
+      try {
+        var lastTick = _.last(model.el.selectAll('.tick')[0]);
+        var lastTickY = Number(lastTick.attributes.transform.textContent.match(/,(.*)\)$/)[1]);
+        if (lastTickY < 20) {
+          lastTick.remove();
+        }
+      } catch (e) {}
+    }
+
     this._renderYLabel('left');
   },