]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
projects / thirdparty / Chart.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5543041)
Time Scale Samples updated to import moment beforehand
authorTanner Linsley <tannerlinsley@gmail.com>
Mon, 28 Sep 2015 18:46:25 +0000 (12:46 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Mon, 28 Sep 2015 18:46:25 +0000 (12:46 -0600)
samples/combo-time-scale.html patch | blob | blame | history
samples/line-time-scale.html patch | blob | blame | history

diff --git a/samples/combo-time-scale.html b/samples/combo-time-scale.html
index f4dc6785b3dd6090162b268f7723cee7d4b3968e..939be9282f6d10cd097543877263acf78d48e9ed 100644 (file)
--- a/samples/combo-time-scale.html
+++ b/samples/combo-time-scale.html
@@ -3,6 +3,7 @@
 
 <head>
     <title>Line Chart</title>
+    <script src="../node_modules/moment/min/moment.min.js"></script>
     <script src="../Chart.js"></script>
     <script src="../node_modules/jquery/dist/jquery.min.js"></script>
     <style>
@@ -81,7 +82,7 @@
                     xAxes: [{
                         type: "time",
                         display: true,
-                        tick: {
+                        time: {
                             format: 'MM/DD/YYYY HH:mm',
                             // round: 'day'
                         }
diff --git a/samples/line-time-scale.html b/samples/line-time-scale.html
index d25cb8890032f926f15fe5d09bc0f8c4e19d4227..327054703e4606ebb6cc7a0bbbd0e795d3945c85 100644 (file)
--- a/samples/line-time-scale.html
+++ b/samples/line-time-scale.html
@@ -3,6 +3,7 @@
 
 <head>
     <title>Line Chart</title>
+    <script src="../node_modules/moment/min/moment.min.js"></script>
     <script src="../Chart.js"></script>
     <script src="../node_modules/jquery/dist/jquery.min.js"></script>
     <style>
@@ -70,7 +71,7 @@
                     xAxes: [{
                         type: "time",
                         display: true,
-                        tick: {
+                        time: {
                             format: 'MM/DD/YYYY HH:mm',
                             // round: 'day'
                         },
Mirror of https://github.com/chartjs/Chart.js.git