diff options
| author | jpl | 2017-04-20 15:57:14 +0200 |
|---|---|---|
| committer | jpl | 2017-04-20 15:57:14 +0200 |
| commit | 31a24a86f4830fd5c993e7f22a7b06b71258907d (patch) | |
| tree | bfb320c0f10a3d2438b5f6cb53004a166fb84f45 /app/assets/javascripts/es6_browserified | |
| parent | e29e4c46bce58ca54a9eb10620038caebbf6f208 (diff) | |
| download | chouette-core-31a24a86f4830fd5c993e7f22a7b06b71258907d.tar.bz2 | |
RefsĀ #2892: update stuff
Diffstat (limited to 'app/assets/javascripts/es6_browserified')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js index a023360a5..de359b99e 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js @@ -74,7 +74,7 @@ const actions = { let M = actions.monthName(strDate).toLowerCase() let Y = origin[0] - if(mLimit) { + if(mLimit && M.length > mLimit) { M = M.substr(0, mLimit) + '.' } diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js index 35968fea3..01996b016 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js @@ -36,7 +36,7 @@ class PeriodManager extends Component { <button type='button' > - Action + Modifier </button> </li> <li className='delete-action'> @@ -44,7 +44,7 @@ class PeriodManager extends Component { type='button' > <span className='fa fa-trash'></span> - Action + Supprimer </button> </li> </ul> diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js index adc500c86..901b2205e 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js @@ -41,7 +41,7 @@ class PeriodsInDay extends Component { let d = this.props.currentDate.getTime() if(d >= begin && d <= end) { - if(d == begin) { + if(d == begin || (this.props.currentDate.getUTCDate() == 1)) { return ( <PeriodManager key={i} |
