diff options
| author | jpl | 2017-07-18 12:35:03 +0200 |
|---|---|---|
| committer | jpl | 2017-07-18 12:35:03 +0200 |
| commit | c252c92cd9e78f6046ea5e9c82f2842f559368bc (patch) | |
| tree | 9171d7180f12db1220c243fb08a458967547da90 /app/assets/javascripts | |
| parent | e0cc93333dbc78af7714b22d3c44efc0b7682a8f (diff) | |
| download | chouette-core-c252c92cd9e78f6046ea5e9c82f2842f559368bc.tar.bz2 | |
Refs #4113: updating calendar filter on VJ
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js index b236e7d94..dd098053e 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js @@ -2,6 +2,7 @@ var _ = require('lodash') var React = require('react') var PropTypes = require('react').PropTypes var Select2 = require('react-select2') +var actions = require('../../../actions') // get JSON full path var origin = window.location.origin @@ -37,13 +38,12 @@ class BSelect4 extends React.Component{ }; }, processResults: function(data, params) { - return { results: data.map( item => _.assign( {}, item, - {text: item.comment} + {text: '<strong>' + item.short_id + ' - ' + (item.color ? "<span class='fa fa-circle' style='color:" + item.color + "'></span> - " : '') + item.comment + '</strong><br/><small>' + item.day_types.match(/[A-Z]?[a-z]+/g).join(', ') + '</small>'} ) ) }; @@ -51,6 +51,7 @@ class BSelect4 extends React.Component{ cache: true }, minimumInputLength: 3, + escapeMarkup: function (markup) { return markup; }, templateResult: formatRepo }} /> |
