Merge pull request #1 from masayuki0812/master

merging upstream

bower.json

@@ -4,7 +4,7 @@
     "c3.css",
     "c3.js"
   ],
-  "version": "0.2.4",
+  "version": "0.2.5",
   "homepage": "https://github.com/masayuki0812/c3",
   "authors": [
     "Masayuki Tanaka <masayuki0812@mac.com>"

c3.js

@@ -4,7 +4,7 @@
     /*global define, module, exports, require */
 
     var c3 = {
-        version: "0.2.4"
+        version: "0.2.5"
     };
 
     var CLASS = {
@@ -2063,7 +2063,7 @@
                 if (tooltipRight > chartRight) {
                     tooltipLeft -= tooltipRight - chartRight;
                 }
-                if (tooltipTop + tHeight > getCurrentHeight()) {
+                if (tooltipTop + tHeight > getCurrentHeight() && tooltipTop > tHeight + 30) {
                     tooltipTop -= tHeight + 30;
                 }
             }
@@ -5559,8 +5559,15 @@
             return axis;
         };
         axis.tickValues = function (x) {
-            if (!arguments.length) { return tickValues; }
-            tickValues = x;
+            if (typeof x === 'function') {
+                tickValues = function () {
+                    return x(scale.domain());
+                };
+            }
+            else {
+                if (!arguments.length) { return tickValues; }
+                tickValues = x;
+            }
             return axis;
         };
         return axis;

component.json

@@ -2,7 +2,7 @@
   "name": "c3",
   "repo": "masayuki0812/c3",
   "description": "A D3-based reusable chart library",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "keywords": [],
   "dependencies": {
     "mbostock/d3": "*"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "c3",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "D3-based reusable chart library",
   "main": "c3.js",
   "scripts": {