Merged upstream to 0.1.42, conflicts resolved; Fixed errors with rectW function…

Merged upstream to 0.1.42, conflicts resolved; Fixed errors with rectW function where __interaction_enabled block exists in redraw function.

Merged upstream to 0.1.42, conflicts resolved; Fixed errors with rectW function…
3b421383 · Brandon Bernal · 4a60047d · d3528a7b · 3b421383 · 3b421383
Commit 3b421383 authored May 21, 2014 by Brandon Bernal
9 changed files
--- a/README.md
+++ b/README.md
@@ -4,3 +4,6 @@ c3 [![Build Status](https://travis-ci.org/masayuki0812/c3.png?branch=master)](ht
 c3 is a D3-based reusable chart library that enables deeper integration of charts into web applications.
 More information is here: [http://c3js.org](http://c3js.org/)
+ [Getting Started](http://c3js.org/gettingstarted.html)
+ [Examples](http://c3js.org/examples.html)
--- a/bower.json
+++ b/bower.json
 {
  "name": "c3",
  "main": "c3.min.js",
-  "version": "0.1.41",
+  "version": "0.1.42",
  "homepage": "https://github.com/masayuki0812/c3",
  "authors": [
    "Masayuki Tanaka <masayuki0812@mac.com>"

--- a/c3.js
+++ b/c3.js
--- a/c3.min.js
+++ b/c3.min.js
--- a/component.json
+++ b/component.json
@@ -2,7 +2,7 @@
  "name": "c3",
  "repo": "masayuki0812/c3",
  "description": "A D3-based reusable chart library",
-  "version": "0.1.41",
+  "version": "0.1.42",
  "keywords": [],
  "dependencies": {
    "mbostock/d3": "*"

--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -40,6 +40,11 @@
              <p>Additional y axis can be added.</p>
              <p><a class="btn btn-default" href="./samples/axes_y2.html" role="button">View details &raquo;</a></p>
            </div>
+            <div class="col-md-4">
+              <h3>Specify Axis Min/Max Values</h3>
+              <p>You can specify your own min/max values for each axis.</p>
+              <p><a class="btn btn-default" href="./samples/axes_minmax.html" role="button">View details &raquo;</a></p>
+            </div>            
          </div>
        </div>
      </div>

--- a/htdocs/samples/axes_minmax.html
+++ b/htdocs/samples/axes_minmax.html
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="/css/c3.css">
+  </head>
+  <body>
+    <div id="chart"></div>
+    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="/js/c3.js"></script>
+    <script>
+      var chart = c3.generate({
+        bindto: '#chart',
+        data: {
+          columns: [
+            ['sample', 100, 200, 100, 400, 150, 250]
+          ],
+          onclick: function (d, element) { console.log("onclick", d, element); },
+          onenter: function (d) { console.log("onenter", d); },
+          onleave: function (d) { console.log("onleave", d); },
+        },
+        axis: {
+          y: {
+              min: 0
+            }
+          },
+      });
+    </script>
+  </body>
+</html>
--- a/htdocs/samples/element.html
+++ b/htdocs/samples/element.html
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="/css/c3.css">
+  </head>
+  <body>
+<!--    <div id="chart"></div>-->
+    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="/js/c3.js"></script>
+    <script>
+      var chart = c3.generate({
+        data: {
+          columns: [
+            ['sample', 30, 200, 100, null, 150, 250]
+          ],
+        },
+//        size: {
+//          width: 640,
+//          height: 320
+//        }
+      });
+      setTimeout(function () {
+        document.body.appendChild(chart.element);
+      }, 1000);
+    </script>
+  </body>
+</html>
--- a/package.json
+++ b/package.json
 {
  "name": "c3",
-  "version": "0.1.41",
+  "version": "0.1.42",
  "description": "D3-based reusable chart library",
  "main": "c3.js",
  "scripts": {