Merge branch 'master' into rename-repo-url

2026-09-09 11:13:57 +08:00 · 2016-03-17 21:06:54 +09:00
parent 56295f5058 89f1449d19
commit 7de6c3dd94
1140 changed files with 179704 additions and 179635 deletions
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_bullet {
+namespace nvd3_test_bullet {
    var width = 960,
        height = 55,
        margin = { top: 5, right: 40, bottom: 20, left: 120 };
@@ -11,9 +11,9 @@ module nvd3_test_bullet {

    var data = [
        { "title": "Revenue", "subtitle": "US$, in thousands", "ranges": [-150, -225, -300], "measures": [-220], "markers": [-250] }
-    ]; 
+    ];

-    //TODO: to be consistent with other models, should be appending a g to an already made svg, not creating the svg element 
+    //TODO: to be consistent with other models, should be appending a g to an already made svg, not creating the svg element
    var vis = d3.select("#chart").selectAll("svg")
        .data(data)
        .enter().append("svg")
@@ -44,4 +44,4 @@ module nvd3_test_bullet {
    }

    d3.select('body').on('click', transition);
-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_bulletChart {
+namespace nvd3_test_bulletChart {
    var width = 960,
        height = 80,
        margin = { top: 5, right: 40, bottom: 20, left: 120 };
@@ -28,9 +28,9 @@ module nvd3_test_bulletChart {
        "markerLabels": ['Target Inventory', 'Low Inventory'],
        "rangeLabels": ['Maximum Inventory', 'Average Inventory', 'Minimum Inventory'],
        "measureLabels": ['Current Inventory']
-    }]; 
+    }];

-    //TODO: to be consistent with other models, should be appending a g to an already made svg, not creating the svg element 
+    //TODO: to be consistent with other models, should be appending a g to an already made svg, not creating the svg element
    var vis = d3.select("#chart").selectAll("svg")
        .data(data)
        .enter().append("svg")
@@ -70,4 +70,4 @@ module nvd3_test_bulletChart {
    }

    d3.select('body').on('click', transition);
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_candlestick {
+namespace nvd3_test_candlestick {
    var data = [{
        values: [
            { "date": 15854, "open": 165.42, "high": 165.8, "low": 164.34, "close": 165.22, "volume": 160363400, "adjusted": 164.35 },
@@ -87,4 +87,4 @@ module nvd3_test_candlestick {
        nv.utils.windowResize(chart.update);
        return chart;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_candlestickChart {
+namespace nvd3_test_candlestickChart {
    var data = [{
        values: [
            { "date": 15854, "open": 165.42, "high": 165.8, "low": 164.34, "close": 165.22, "volume": 160363400, "adjusted": 164.35 },
@@ -105,4 +105,4 @@ module nvd3_test_candlestickChart {
        nv.utils.windowResize(chart.update);
        return chart;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_cumulativeLineChart {
+namespace nvd3_test_cumulativeLineChart {
    // Wrapping in nv.addGraph allows for '0 timeout render', stores rendered charts in nv.graphs,
    // and may do more in the future... it's NOT required
    nv.addGraph(function () {
@@ -32,7 +32,7 @@ module nvd3_test_cumulativeLineChart {
        chart.state.dispatch.on('change', function (state) {
            nv.log('state', JSON.stringify(state));
        });
-        
+
        return chart;
    });

@@ -72,4 +72,4 @@ module nvd3_test_cumulativeLineChart {
            }
        ];
    }
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_discreteBarChart {
+namespace nvd3_test_discreteBarChart {
    var historicalBarChart = [
        {
            key: "Cumulative Return",
@@ -57,4 +57,4 @@ module nvd3_test_discreteBarChart {
        nv.utils.windowResize(chart.update);
        return chart;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_donutChart {
+namespace nvd3_test_donutChart {
    var testdata = [
        { key: "One", y: 5 },
        { key: "Two", y: 2 },
@@ -90,4 +90,4 @@ module nvd3_test_donutChart {

        return chart2;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_furiousLegend {
+namespace nvd3_test_furiousLegend {
    var width = 500,
        height = 40;

@@ -69,4 +69,4 @@ module nvd3_test_furiousLegend {
            { key: "Apple", disengaged: true }
        ];
    }
-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_legend {
+namespace nvd3_test_legend {
    var width = 500,
        height = 20;

@@ -66,4 +66,4 @@ module nvd3_test_legend {
            { key: "Apple" }
        ];
    }
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_line {
+namespace nvd3_test_line {
    nv.addGraph({
        generate: function () {
            var width = nv.utils.windowSize().width - 40,
@@ -68,4 +68,4 @@ module nvd3_test_line {
        ];
    }

-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_lineChart {
+namespace nvd3_test_lineChart {
    // Wrapping in nv.addGraph allows for '0 timeout render', stores rendered charts in nv.graphs, and may do more in the future... it's NOT required
    var chart;
    var data;
@@ -100,4 +100,4 @@ module nvd3_test_lineChart {
        ];
    }

-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_lineChartLogScale {
+namespace nvd3_test_lineChartLogScale {
 var chart;
     var data;

@@ -38,30 +38,30 @@ var chart;
     function GenerateData() {
           var sin = [],
               sin2 = [];
-  
+
           for (var i = 0; i < 100; i++) {
-                   sin.push({ x: i, y: Math.abs(i % 10 == 5 ? null : Math.sin(i / 10)) }); //the nulls are to show how defined works 
+                   sin.push({ x: i, y: Math.abs(i % 10 == 5 ? null : Math.sin(i / 10)) }); //the nulls are to show how defined works
                   sin2.push({ x: i, y: Math.abs(Math.sin(i / 5) * 0.4 - 0.25) });
-      
+
  }
-  
+
           return [
-                { 
-                           area: true, 
+                {
+                           area: true,
                           values: sin,
-                           key: "l1", 
-                           color: "#ff7f0e", 
-                           strokeWidth: 4, 
-                           classed: 'dashed' 
+                           key: "l1",
+                           color: "#ff7f0e",
+                           strokeWidth: 4,
+                           classed: 'dashed'
         },
-                  { 
+                  {
                           values: sin2,
-                           key: "l2", 
-                           color: "#2ca02c" 
-         } 
+                           key: "l2",
+                           color: "#2ca02c"
+         }
     ];

-  } 
+  }

-  
-}
+
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_lineChartSVGResize {
+namespace nvd3_test_lineChartSVGResize {
    nv.addGraph(function () {
        var chart = nv.models.lineChart();
        var fitScreen = false;
@@ -104,5 +104,5 @@ module nvd3_test_lineChartSVGResize {
        ];
    }

-  
-}
+
+}
@@ -1,10 +1,10 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_linePlusBarChart {
+namespace nvd3_test_linePlusBarChart {
    var testdata = [
        {
            "key": "Quantity",
            "bar": true,
-            "values": <any>[[1136005200000, 1271000.0], [1138683600000, 1271000.0], [1141102800000, 1271000.0], [1143781200000, 0], [1146369600000, 0], [1149048000000, 0], [1151640000000, 0], [1154318400000, 0], [1156996800000, 0], [1159588800000, 3899486.0], [1162270800000, 3899486.0], [1164862800000, 3899486.0], [1167541200000, 3564700.0], [1170219600000, 3564700.0], [1172638800000, 3564700.0], [1175313600000, 2648493.0], [1177905600000, 2648493.0], [1180584000000, 2648493.0], [1183176000000, 2522993.0], [1185854400000, 2522993.0], [1188532800000, 2522993.0], [1191124800000, 2906501.0], [1193803200000, 2906501.0], [1196398800000, 2906501.0], [1199077200000, 2206761.0], [1201755600000, 2206761.0], [1204261200000, 2206761.0], [1206936000000, 2287726.0], [1209528000000, 2287726.0], [1212206400000, 2287726.0], [1214798400000, 2732646.0], [1217476800000, 2732646.0], [1220155200000, 2732646.0], [1222747200000, 2599196.0], [1225425600000, 2599196.0], [1228021200000, 2599196.0], [1230699600000, 1924387.0], [1233378000000, 1924387.0], [1235797200000, 1924387.0], [1238472000000, 1756311.0], [1241064000000, 1756311.0], [1243742400000, 1756311.0], [1246334400000, 1743470.0], [1249012800000, 1743470.0], [1251691200000, 1743470.0], [1254283200000, 1519010.0], [1256961600000, 1519010.0], [1259557200000, 1519010.0], [1262235600000, 1591444.0], [1264914000000, 1591444.0], [1267333200000, 1591444.0], [1270008000000, 1543784.0], [1272600000000, 1543784.0], [1275278400000, 1543784.0], [1277870400000, 1309915.0], [1280548800000, 1309915.0], [1283227200000, 1309915.0], [1285819200000, 1331875.0], [1288497600000, 1331875.0], [1291093200000, 1331875.0], [1293771600000, 1331875.0], [1296450000000, 1154695.0], [1298869200000, 1154695.0], [1301544000000, 1194025.0], [1304136000000, 1194025.0], [1306814400000, 1194025.0], [1309406400000, 1194025.0], [1312084800000, 1194025.0], [1314763200000, 1244525.0], [1317355200000, 475000.0], [1320033600000, 475000.0], [1322629200000, 475000.0], [1325307600000, 690033.0], [1327986000000, 690033.0], [1330491600000, 690033.0], [1333166400000, 514733.0], [1335758400000, 514733.0]] 
+            "values": <any>[[1136005200000, 1271000.0], [1138683600000, 1271000.0], [1141102800000, 1271000.0], [1143781200000, 0], [1146369600000, 0], [1149048000000, 0], [1151640000000, 0], [1154318400000, 0], [1156996800000, 0], [1159588800000, 3899486.0], [1162270800000, 3899486.0], [1164862800000, 3899486.0], [1167541200000, 3564700.0], [1170219600000, 3564700.0], [1172638800000, 3564700.0], [1175313600000, 2648493.0], [1177905600000, 2648493.0], [1180584000000, 2648493.0], [1183176000000, 2522993.0], [1185854400000, 2522993.0], [1188532800000, 2522993.0], [1191124800000, 2906501.0], [1193803200000, 2906501.0], [1196398800000, 2906501.0], [1199077200000, 2206761.0], [1201755600000, 2206761.0], [1204261200000, 2206761.0], [1206936000000, 2287726.0], [1209528000000, 2287726.0], [1212206400000, 2287726.0], [1214798400000, 2732646.0], [1217476800000, 2732646.0], [1220155200000, 2732646.0], [1222747200000, 2599196.0], [1225425600000, 2599196.0], [1228021200000, 2599196.0], [1230699600000, 1924387.0], [1233378000000, 1924387.0], [1235797200000, 1924387.0], [1238472000000, 1756311.0], [1241064000000, 1756311.0], [1243742400000, 1756311.0], [1246334400000, 1743470.0], [1249012800000, 1743470.0], [1251691200000, 1743470.0], [1254283200000, 1519010.0], [1256961600000, 1519010.0], [1259557200000, 1519010.0], [1262235600000, 1591444.0], [1264914000000, 1591444.0], [1267333200000, 1591444.0], [1270008000000, 1543784.0], [1272600000000, 1543784.0], [1275278400000, 1543784.0], [1277870400000, 1309915.0], [1280548800000, 1309915.0], [1283227200000, 1309915.0], [1285819200000, 1331875.0], [1288497600000, 1331875.0], [1291093200000, 1331875.0], [1293771600000, 1331875.0], [1296450000000, 1154695.0], [1298869200000, 1154695.0], [1301544000000, 1194025.0], [1304136000000, 1194025.0], [1306814400000, 1194025.0], [1309406400000, 1194025.0], [1312084800000, 1194025.0], [1314763200000, 1244525.0], [1317355200000, 475000.0], [1320033600000, 475000.0], [1322629200000, 475000.0], [1325307600000, 690033.0], [1327986000000, 690033.0], [1330491600000, 690033.0], [1333166400000, 514733.0], [1335758400000, 514733.0]]
        },
        {
            "key": "Price",
@@ -44,4 +44,4 @@ module nvd3_test_linePlusBarChart {

        return chart;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_lineWithFocusChart {
+namespace nvd3_test_lineWithFocusChart {
    nv.addGraph(function () {
        var chart = nv.models.lineWithFocusChart();

@@ -30,4 +30,4 @@ module nvd3_test_lineWithFocusChart {
            };
        });
    }
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_lineWithFocusChartx2AxisLabel {
+namespace nvd3_test_lineWithFocusChartx2AxisLabel {

    nv.addGraph(function () {
        var chart = nv.models.lineWithFocusChart();
@@ -33,4 +33,4 @@ module nvd3_test_lineWithFocusChartx2AxisLabel {
            };
        });
    }
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_monitoringChart {
+namespace nvd3_test_monitoringChart {

    var testdata1 = [
        { key: "Updated", y: 0 },
@@ -131,5 +131,5 @@ module nvd3_test_monitoringChart {
        return chart;

    });
-   
-}
+
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_multiChart {
+namespace nvd3_test_multiChart {
    //todo resolve stream_layersIssue var testdata = stream_layers(9, 10 + Math.random() * 100, .1).map(function (data, i) {
    //    return {
    //        key: 'Stream' + i,
@@ -50,4 +50,4 @@ module nvd3_test_multiChart {

        return chart;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_multibarChart {
+namespace nvd3_test_multibarChart {
    //todo resolve stream_layers var test_data = stream_layers(3, 10 + Math.random() * 100, .1).map(function (data, i) {
    var test_data = [3, 10 + Math.random() * 100, .1].map(function (data, i) {
        return {
@@ -66,4 +66,4 @@ module nvd3_test_multibarChart {

        return chart;
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_multibarChart2 {
+namespace nvd3_test_multibarChart2 {
    //todo resolve stream_layers var test_data = stream_layers(3, 128, .1).map(function (data, i) {
    var test_data = [3, 128, .1].map(function (data, i) {
        return {
@@ -44,4 +44,4 @@ module nvd3_test_multibarChart2 {
            });
        }
    });
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_multibarHorizontalChart {
+namespace nvd3_test_multibarHorizontalChart {
    var long_short_data = [
        {
            key: 'Series1',
@@ -156,4 +156,4 @@ module nvd3_test_multibarHorizontalChart {
        return chart;
    });

-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_ohlc {
+namespace nvd3_test_ohlc {
    var data = [{
        values: [
            { "date": 15707, "open": 145.11, "high": 146.15, "low": 144.73, "close": 146.06, "volume": 192059000, "adjusted": 144.65 },
@@ -189,4 +189,4 @@ module nvd3_test_ohlc {
        nv.utils.windowResize(chart.update);
        return chart;
    });
-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_ohlcChart {
+namespace nvd3_test_ohlcChart {
    var data = [{
        values: [
            { "date": 15707, "open": 145.11, "high": 146.15, "low": 144.73, "close": 146.06, "volume": 192059000, "adjusted": 144.65 },
@@ -13,14 +13,14 @@ module nvd3_test_ohlcChart {
            .x(function (d) { return d['date'] })
            .y(function (d) { return d['close'] })
            .duration(250)
-            .margin({ left: 75, bottom: 50 }); 
+            .margin({ left: 75, bottom: 50 });

-        // chart sub-models (ie. xAxis, yAxis, etc) when accessed directly, return themselves, not the parent chart, so need to chain separately 
+        // chart sub-models (ie. xAxis, yAxis, etc) when accessed directly, return themselves, not the parent chart, so need to chain separately
        chart.xAxis
            .axisLabel("Dates")
-            .tickFormat(function (d) { 
-                // I didn't feel like changing all the above date values 
-                // so I hack it to make each value fall on a different date 
+            .tickFormat(function (d) {
+                // I didn't feel like changing all the above date values
+                // so I hack it to make each value fall on a different date
                return d3.time.format('%x')(new Date(new Date().valueOf() - (20000 * 86400000) + (d * 86400000)));
            });

@@ -37,4 +37,4 @@ module nvd3_test_ohlcChart {
        nv.utils.windowResize(chart.update);
        return chart;
    });
-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_parallelCoordinates {
+namespace nvd3_test_parallelCoordinates {
    var chart;
    nv.addGraph(function () {

@@ -44,4 +44,4 @@ module nvd3_test_parallelCoordinates {
            }
        ]
    }
-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_parallelCoordinatesChart {
+namespace nvd3_test_parallelCoordinatesChart {
    var chart;
    function resetBrush() {
        chart.filters([]);
@@ -183,4 +183,4 @@ module nvd3_test_parallelCoordinatesChart {
            }
        ];
    }
-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_pie {
+namespace nvd3_test_pie {

    var testdata = [
        { key: "One", y: 5 },
@@ -68,4 +68,4 @@ module nvd3_test_pie {
        return chart;
    });

-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_pieChart {
+namespace nvd3_test_pieChart {

    var testdata = [
        { key: "One", y: 5, color: "#5F5" },
@@ -107,4 +107,4 @@ module nvd3_test_pieChart {
        return chart;
    });

-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_scatter {
+namespace nvd3_test_scatter {
    nv.addGraph(function () {

        var chart = nv.models.scatter()
@@ -32,4 +32,4 @@ module nvd3_test_scatter {

        return data;
    }
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_scatterChart {
+namespace nvd3_test_scatterChart {
    // register our custom symbols to nvd3
    // make sure your path is valid given any size because size scales if the chart scales.
    nv.utils.symbolMap.set('thin-x', function (size) {
@@ -63,4 +63,4 @@ module nvd3_test_scatterChart {
        return data;
    }

-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_scatterPlusLineChart {
+namespace nvd3_test_scatterPlusLineChart {
    var chart;
    nv.addGraph(function () {
        chart = nv.models.scatterChart()
@@ -50,4 +50,4 @@ module nvd3_test_scatterPlusLineChart {
        return data;
    }

-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_sparkLine {
+namespace nvd3_test_sparkLine {

    nv.addGraph({
        generate: function () {
@@ -24,4 +24,4 @@ module nvd3_test_sparkLine {

        return sin;
    }
-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_sparkLinePlus {
+namespace nvd3_test_sparkLinePlus {
    function defaultChartConfig(containerId, data) {
        nv.addGraph(function () {

@@ -51,4 +51,4 @@ module nvd3_test_sparkLinePlus {
        return rval;
    }

-}
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_stackArea {
+namespace nvd3_test_stackArea {
    nv.addGraph({
        generate: function () {
            var n = 10, // number of layers
@@ -92,5 +92,5 @@ module nvd3_test_stackArea {
        return { x: i, y: Math.max(0, d) };
    }

-  
-}
+
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_stackAreaChart {
+namespace nvd3_test_stackAreaChart {
    var histcatexplong = [
        {
            "key": "Consumer Discretionary",
@@ -75,5 +75,5 @@ module nvd3_test_stackAreaChart {
        nv.utils.windowResize(chart.update);
        return chart;
    });
-  
-}
+
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_sunburst {
+namespace nvd3_test_sunburst {

    var chart;

@@ -398,5 +398,5 @@ module nvd3_test_sunburst {
                }
            ]
        }];
-    }  
-}
+    }
+}
@@ -1,5 +1,5 @@
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_timeSeries {
+namespace nvd3_test_timeSeries {
    var data = [{
        values: []
    }];
@@ -164,4 +164,4 @@ module nvd3_test_timeSeries {
        }
    }

-}
+}
@@ -1,6 +1,6 @@
 /// <reference path="../d3/d3.d.ts" />
 /// <reference path="nvd3.d.ts" />
-module nvd3_test_tooltip {
+namespace nvd3_test_tooltip {
    var width = 500,
        height = 20;

@@ -26,11 +26,11 @@ module nvd3_test_tooltip {
        .on('mousemove', function (d, i) {
            console.log("mousemove", d, i);
            //tooltip.position({ top: d3.event.pageY, left: d3.event.pageX })(); todo pageY and X not found on d3 definition
-        }); 
+        });


-    // we must also test the scatter/line way of getting position 
-    // Wrapping in nv.addGraph allows for '0 timeout render', stores rendered charts in nv.graphs, and may do more in the future... it's NOT required 
+    // we must also test the scatter/line way of getting position
+    // Wrapping in nv.addGraph allows for '0 timeout render', stores rendered charts in nv.graphs, and may do more in the future... it's NOT required
    var chart;
    nv.addGraph(function () {
        chart = nv.models.lineChart()
@@ -56,4 +56,4 @@ module nvd3_test_tooltip {
            color: "#2ca02c"
        }];
    }
-}
+}
@@ -4,13 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

 /// <reference path="../d3/d3.d.ts" />
-declare module nv {
+declare namespace nv {

 //#region Core Interfaces
 	interface Margin {
 		left?: number,
 		right?: number,
-		top?: number, 
+		top?: number,
 		bottom?: number
 	}

@@ -90,7 +90,7 @@ declare module nv {
        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
        color(value: string[]): this;
        /*Colors to use for the different data. If an array is given, it is converted to a function automatically.*/
-        color(func: (d: any, i: number) => string): this;	
+        color(func: (d: any, i: number) => string): this;
        expanded(): boolean;
        expanded(value: boolean): this;
        /*The height the graph or component created inside the SVG should be made*/
@@ -108,7 +108,7 @@ declare module nv {
        /*Specifies how much spacing there is between legend items.*/
        padding(value: number): this;
        radioButtonMode(): boolean;
-        //If true, clicking legend items will cause it to behave like a radio button. (only one can be selected at 
+        //If true, clicking legend items will cause it to behave like a radio button. (only one can be selected at
        radioButtonMode(value: boolean): this;
        rightAlign(): boolean;
        rightAlign(value: boolean): this;
@@ -119,13 +119,13 @@ declare module nv {
        //Options are "classic" and "furious"
        vers(): string;
        //Options are "classic" and "furious"
-        vers(value: string): this;        
+        vers(value: string): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;	     
+        width(value: number): this;
    }
-	
+
 	interface Nvd3Axis extends d3.svg.Axis {
        axisLabel(): string;
        axisLabel(value: string): this;
@@ -146,7 +146,7 @@ declare module nv {
        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
        margin(value: Margin): this;
        orient(): string;
-        orient(orientation: string): this;        
+        orient(orientation: string): this;
        range(): number[];
        range(range: number[]): this;
        rangeBand(): number;
@@ -178,7 +178,7 @@ declare module nv {
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;			
+        width(value: number): this;
 	}

    interface BoxPlot extends Nvd3Element {
@@ -201,7 +201,7 @@ declare module nv {
        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
        margin(value: Margin): this;
        maxBoxWidth(): number;
-        maxBoxWidth(value: number): this;	
+        maxBoxWidth(value: number): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
@@ -271,7 +271,7 @@ declare module nv {
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this;        
+        width(value: number): this;
    }

    interface CandlestickBar extends Nvd3Element {
@@ -312,7 +312,7 @@ id(value: number|string): this;
        /*Object containing the margins for the chart or component. You can specify only certain margins in the object to change just those parts.*/
        margin(value: Margin): this;
        open(): (d: any) => number;
-        open(func: (d: any) => number): this;	
+        open(func: (d: any) => number): this;
        padData(): boolean;
        padData(value: boolean): this;
        /* The width the graph or component created inside the SVG should be made*/
@@ -444,7 +444,7 @@ id(value: number|string): this;
        size(value: number): this;
        width(): number;
        width(value: number): this;
-        
+

    }

@@ -539,7 +539,7 @@ id(value: number|string): this;
        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
        isArea(value: boolean): this;
        /*Function to define if a line is a normal line or if it fills in the area. Notice the default gets the value from the line's definition in data. If a non-function is given, it the value is used for all lines.*/
-        isArea(func: (d: any) => boolean): this;       
+        isArea(func: (d: any) => boolean): this;
    }

    interface MultiBar extends Nvd3Element {
@@ -558,7 +558,7 @@ id(value: number|string): this;
        /**/
        disabled(): boolean[];
        /**/
-        disabled(value: boolean[]): this;        
+        disabled(value: boolean[]): this;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
        duration(): number;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
@@ -650,7 +650,7 @@ id(value: number|string): this;
        /**/
        disabled(): boolean[];
        /**/
-        disabled(value: boolean[]): this;        
+        disabled(value: boolean[]): this;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
        duration(): number;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
@@ -700,7 +700,7 @@ id(value: number|string): this;
        /*.*/
        valuePadding(): number;
        /**/
-        valuePadding(value: number): this;      
+        valuePadding(value: number): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
@@ -838,7 +838,7 @@ id(value: number|string): this;
        /*Deprecated. Use dimensionsNames instead. */
        dimensions(): any;
        /*Deprecated. Use dimensionsNames instead. .*/
-        dimensions(value: any): this;        
+        dimensions(value: any): this;
        /*The height the graph or component created inside the SVG should be made*/
        height(): number;
        /*The height the graph or component created inside the SVG should be made.*/
@@ -1030,7 +1030,7 @@ id(value: number|string): this;
        /**/
        padDataOuter(): number;
        /**/
-        padDataOuter(value: number): this;	
+        padDataOuter(value: number): this;
        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
        pointActive(): (d: any) => boolean;
        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
@@ -1308,8 +1308,8 @@ id(value: number|string): this;
    }

 //#endregion
-    
-//#region Charts  
+
+//#region Charts
    interface BoxPlotChart extends Chart {
        boxplot: BoxPlot;
        xAxis: Nvd3Axis;
@@ -1345,7 +1345,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -1447,7 +1447,7 @@ id(value: number|string): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
-        width(value: number): this; 
+        width(value: number): this;
 	}

    interface CandlestickBarChart extends Chart {
@@ -1490,7 +1490,7 @@ id(value: number|string): this;
        high(): (d: any) => number;
        high(func: (d: any) => number): this;
        id(): any;
-        id(value: number|string): this; 
+        id(value: number|string): this;
        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
        interactive(): boolean;
        /*A master flag for turning chart interaction on and off. This overrides all tooltip, voronoi, and guideline options.*/
@@ -1518,7 +1518,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -1570,7 +1570,7 @@ id(value: number|string): this;
        yScale(): any;
        /* Override the default scale type for the y axis*/
        yScale(value: any): this;
-    }   
+    }

    interface CumulativeLineChart extends LineChart {
        controls: Legend;
@@ -1623,7 +1623,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -1639,7 +1639,7 @@ id(value: number|string): this;
        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
        tooltips(): boolean;
        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;       
+        tooltips(value: boolean): this;
        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
        valueFormat(): string;
        /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
@@ -1741,7 +1741,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -1753,11 +1753,11 @@ id(value: number|string): this;
        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
        tooltips(): boolean;
        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
-        tooltips(value: boolean): this;  
+        tooltips(value: boolean): this;
        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
        useInteractiveGuideline(): boolean;
        /*Sets the chart to use a guideline and floating tooltip instead of requiring the user to hover over specific hotspots. Turning this on will set the 'interactive' and 'useVoronoi' options to false to avoid conflicting.*/
-        useInteractiveGuideline(value: boolean): this;      
+        useInteractiveGuideline(value: boolean): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
@@ -1880,7 +1880,7 @@ id(value: number|string): this;
        /**/
        padDataOuter(): number;
        /**/
-        padDataOuter(value: number): this;	
+        padDataOuter(value: number): this;
        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
        pointActive(): (d: any) => boolean;
        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
@@ -1918,7 +1918,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -2086,7 +2086,7 @@ id(value: number|string): this;
        /**/
        padDataOuter(): number;
        /**/
-        padDataOuter(value: number): this;	
+        padDataOuter(value: number): this;
        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
        pointActive(): (d: any) => boolean;
        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
@@ -2169,7 +2169,7 @@ id(value: number|string): this;
        /* Override the default scale type for the y axis*/
        yScale(value: any): this;
    }
-    
+
    interface LineWithFocusChart extends Chart {
        legend: Legend;
        lines: Line;
@@ -2263,7 +2263,7 @@ id(value: number|string): this;
        /**/
        padDataOuter(): number;
        /**/
-        padDataOuter(value: number): this;	
+        padDataOuter(value: number): this;
        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
        pointActive(): (d: any) => boolean;
        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
@@ -2386,7 +2386,7 @@ id(value: number|string): this;
        /**/
        disabled(): boolean[];
        /**/
-        disabled(value: boolean[]): this;        
+        disabled(value: boolean[]): this;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
        duration(): number;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
@@ -2436,11 +2436,11 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;        
+        showYAxis(value: boolean): this;
        /*.*/
        stacked(): boolean;
        /**/
@@ -2506,7 +2506,7 @@ id(value: number|string): this;
        yScale(value: any): this;

    }
-    
+
    interface MultiBarHorizontalChart extends Chart {
        multibar: MultiBar;
        legend: Legend;
@@ -2534,7 +2534,7 @@ id(value: number|string): this;
        /**/
        disabled(): boolean[];
        /**/
-        disabled(value: boolean[]): this;        
+        disabled(value: boolean[]): this;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
        duration(): number;
        /*Duration in ms to take when updating chart. For things like bar charts, each bar can animate by itself but the total time taken should be this value.*/
@@ -2573,11 +2573,11 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
-        showYAxis(value: boolean): this;        
+        showYAxis(value: boolean): this;
        /*.*/
        stacked(): boolean;
        /**/
@@ -2597,7 +2597,7 @@ id(value: number|string): this;
        /*.*/
        valuePadding(): number;
        /**/
-        valuePadding(value: number): this; 
+        valuePadding(value: number): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
@@ -2711,7 +2711,7 @@ id(value: number|string): this;
        /* */
        yDomain2(value: number[]): this;
    }
-    
+
    interface OhlcBarChart extends Chart {
        bars: OhlcBar;
        legend: Legend;
@@ -2780,7 +2780,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -2832,7 +2832,7 @@ id(value: number|string): this;
        yScale(): any;
        /* Override the default scale type for the y axis*/
        yScale(value: any): this;
-    }   
+    }

    interface ParallelCoordinatesChart extends Chart {
        parallelCoordinates: ParallelCoordinates;
@@ -2859,11 +2859,11 @@ id(value: number|string): this;
        /*Deprecated. Use dimensionsNames instead. */
        dimensions(): any;
        /*Deprecated. Use dimensionsNames instead. .*/
-        dimensions(value: any): this;    
+        dimensions(value: any): this;
        /**/
        displayBrush(): boolean;
        /**/
-        displayBrush(value: boolean): this;    
+        displayBrush(value: boolean): this;
        /*The height the graph or component created inside the SVG should be made*/
        height(): number;
        /*The height the graph or component created inside the SVG should be made.*/
@@ -2879,11 +2879,11 @@ id(value: number|string): this;
        /**/
        noData(): string;
        /**/
-        noData(value: string): this; 
+        noData(value: string): this;
        /**/
        showLegend(): boolean;
        /**/
-        showLegend(value: boolean): this;  
+        showLegend(value: boolean): this;
        /* The width the graph or component created inside the SVG should be made*/
        width(): number;
        /*The width the graph or component created inside the SVG should be made.*/
@@ -3116,7 +3116,7 @@ id(value: number|string): this;
        /**/
        padDataOuter(): number;
        /**/
-        padDataOuter(value: number): this;	
+        padDataOuter(value: number): this;
        /* Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
        pointActive(): (d: any) => boolean;
        /*Function used to determine if scatter points are active or not, returns false to denote them as inactive and true for active.*/
@@ -3146,7 +3146,7 @@ id(value: number|string): this;
        /**/
        showDistX(): boolean;
        /**/
-        showDistX(value: boolean): this;        
+        showDistX(value: boolean): this;
        /**/
        showDistY(): boolean;
        /**/
@@ -3162,7 +3162,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -3178,7 +3178,7 @@ id(value: number|string): this;
        /**/
        tooltipYContent(): (d: any) => string;
        /**/
-        tooltipYContent(func: (d: any) => string): this;        
+        tooltipYContent(func: (d: any) => string): this;
        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
        tooltips(): boolean;
        /*Deprecated. Use chart.tooltip.enabled or chart.interactive to control if tooltips are enabled or not.*/
@@ -3253,7 +3253,7 @@ id(value: number|string): this;
        /*Display or hide the X axis*/
        showXAxis(): boolean;
        /*Display or hide the X axis*/
-        showXAxis(value: boolean): this;        
+        showXAxis(value: boolean): this;
        /*Display or hide the Y axis*/
        showYAxis(): boolean;
        /*Display or hide the Y axis*/
@@ -3289,7 +3289,7 @@ id(value: number|string): this;
        noData(value: string): this;
    }

-//#endregion     
+//#endregion

    interface Models{
        boxPlotChart(): BoxPlotChart;
@@ -3304,7 +3304,7 @@ id(value: number|string): this;
 		historicalBar(): HistoricalBar;
        historicalBarChart(bar_model?: HistoricalBar): HistoricalBarChart;
        ohlcBar(): OhlcBar;
-        ohlcBarChart(): OhlcBarChart;			
+        ohlcBarChart(): OhlcBarChart;
        legend(): Legend;
        line(): Line;
        lineChart(): LineChart;
@@ -3332,11 +3332,11 @@ id(value: number|string): this;
        /*set to false in production*/
        dev: boolean
        /*stores all the ready to use charts*/
-        charts: any 
+        charts: any
        models: Models;
        tooltip: Nvd3TooltipStatic;
        utils: Utils;
-        
+
        /*stores some statistics and potential error messages*/
        logs: any;

@@ -3348,4 +3348,4 @@ id(value: number|string): this;
        log(arg: any[]): any //returns last argument
 	}
 }
-declare var nv : nv.Nvd3Static;
+declare var nv : nv.Nvd3Static;