Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+4 -4
View File
@@ -1,6 +1,6 @@
/// <reference path="canvasjs.d.ts" />
module CanvasJS.Tests {
namespace CanvasJS.Tests {
// Column Chart
var columnChart = new CanvasJS.Chart("chartContainer",
{
@@ -56,7 +56,7 @@ module CanvasJS.Tests {
data: [
{
type: "line",
//lineThickness: 3,
//lineThickness: 3,
dataPoints: [
{ x: new Date(2012, 0, 1), y: 450 },
{ x: new Date(2012, 1, 1), y: 414 },
@@ -100,7 +100,7 @@ module CanvasJS.Tests {
type: "spline",
showInLegend: true,
name: "Season 2",
// markerSize: 0,
// markerSize: 0,
// color: "rgba(54,158,173,.6)",
dataPoints: [
{ label: "Ep. 1", y: 3858000 },
@@ -245,4 +245,4 @@ module CanvasJS.Tests {
addCultureInfo("js", {
days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
});
}
}
+379 -379
View File
File diff suppressed because it is too large Load Diff