diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb index c6d7f2fb3..f7c8589fc 100644 --- a/app/assets/javascripts/controllers/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/trainings.coffee.erb @@ -452,11 +452,12 @@ Application.Controllers.controller "ReserveTrainingController", ["$scope", "$sta # @see http://fullcalendar.io/docs/event_rendering/eventRender/ ## eventRenderCb = (event, element, view)-> - element.attr( - 'uib-popover': $filter('humanize')($filter('simpleText')(event.training.description), 70) - 'popover-trigger': 'mouseenter' - ) - $compile(element)($scope) + # Comment these codes for show a popup of description, because we add feature page of training + #element.attr( + # 'uib-popover': $filter('humanize')($filter('simpleText')(event.training.description), 70) + # 'popover-trigger': 'mouseenter' + #) + #$compile(element)($scope) diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee index 884afac3c..fbf73f7c5 100644 --- a/app/assets/javascripts/filters/filters.coffee +++ b/app/assets/javascripts/filters/filters.coffee @@ -112,7 +112,7 @@ Application.Filters.filter "breakFilter", [ -> ## Application.Filters.filter "simpleText", [ -> (text) -> - if text != undefined + if text? text = text.replace(//g, '\n') text.replace(/<\/?\w+[^>]*>/g, '') else