Modified the number of week for which the x-axis stays in week mode a…

…s discussed in issue #125
mermaid-js · Mar 5, 2015 · 85cdfba · 85cdfba
1 parent 4214091
commit 85cdfba
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/dist/mermaid.full.js b/dist/mermaid.full.js
@@ -28485,8 +28485,8 @@ module.exports.draw = function (text, id) {
                 .tickSize(-h + theTopPad + conf.gridLineStartPadding, 0, 0)
                 .tickFormat(d3.time.format.multi(formatter))
             ;
-
-        if(daysInChart >7 && daysInChart<60){
+        
+        if(daysInChart >7 && daysInChart<230){
             xAxis = xAxis.ticks(d3.time.monday.range);
         }
 

diff --git a/dist/mermaid.full.min.js b/dist/mermaid.full.min.js
diff --git a/dist/mermaid.slim.js b/dist/mermaid.slim.js
@@ -28453,8 +28453,8 @@ module.exports.draw = function (text, id) {
                 .tickSize(-h + theTopPad + conf.gridLineStartPadding, 0, 0)
                 .tickFormat(d3.time.format.multi(formatter))
             ;
-
-        if(daysInChart >7 && daysInChart<60){
+        
+        if(daysInChart >7 && daysInChart<230){
             xAxis = xAxis.ticks(d3.time.monday.range);
         }
 

diff --git a/dist/mermaid.slim.min.js b/dist/mermaid.slim.min.js
diff --git a/src/diagrams/gantt/ganttRenderer.js b/src/diagrams/gantt/ganttRenderer.js
@@ -316,7 +316,7 @@ module.exports.draw = function (text, id) {
                 .tickFormat(d3.time.format.multi(formatter))
             ;
 
-        if(daysInChart >7 && daysInChart<60){
+        if(daysInChart >7 && daysInChart<230){
             xAxis = xAxis.ticks(d3.time.monday.range);
         }
 

diff --git a/test/gantt.html b/test/gantt.html
@@ -219,8 +219,14 @@ <h2>less then a year</h2>
         title Adding GANTT diagram functionality to mermaid
 
         section Design
-        Design jison grammar            :done, crit, des1, 2014-01-06,8w
-        Create example text             :done, after des1, 16w
+        Design1:done, crit, des1, 2014-01-22,4w
+        Design2:after des1, 3w
+        Design3:3w
+        Design4:3w
+        Design5:18d
+        Design6:2w
+        Implementation1:3w
+        Implementation2:3w
     </div>
     <h1>Other tests</h1>
     <div class="mermaid">

diff --git a/test/mix.html b/test/mix.html
@@ -160,5 +160,8 @@
         Add gantt diagram to demo page      : 20h
         Add another diagram to demo page    : 48h
     </div>
+    <div class="mermaid">
+        info
+    </div>
     </body>
 </html>