diff options
| author | Bruno Perles | 2015-11-03 17:30:33 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-11-03 17:30:33 +0100 |
| commit | fbafa0e7efc71aa392d0d400e1777203cc95c841 (patch) | |
| tree | 72d9d4b110784d06555d262dff5a17391795046f /app/assets/javascripts | |
| parent | 915612ee90b2f454486fa821fdd75b800c326c99 (diff) | |
| download | chouette-core-fbafa0e7efc71aa392d0d400e1777203cc95c841.tar.bz2 | |
Update IHM for vehicle journey frequency
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 6 insertions, 16 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 74e680a68..1ae76cd05 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -23,12 +23,11 @@ //= require footable/footable.paginate //= require footable/footable.sort //= require tools -//= require datatables -//= require datatables-fixedcolumns //= require_directory ./plugins //= require_directory . //= require_directory ./stop_areas //= require_directory ./vehicle_journeys +//= require_directory ./vehicle_journey_frequencies //= require_directory ./import_tasks //= require_directory ./compliance_check_tasks //= require_directory ./compliance_checks diff --git a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee index 020283116..e69de29bb 100644 --- a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee +++ b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee @@ -1,13 +0,0 @@ -(($) -> - $ -> - $('.ce-VehicleJourneyFrequencyTableBlock').dataTable - searching: false, - ordering: false, - paging: false, - scrollX: true, - fixedColumns: true, - bInfo: false - window.setTimeout('$( ".dataTables_scrollBody" ).animate({scrollLeft: 100}, 500).animate({scrollLeft: 0}, 500)', 1000) - return - return -) jQuery diff --git a/app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee new file mode 100644 index 000000000..4f4fccc18 --- /dev/null +++ b/app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee @@ -0,0 +1,4 @@ +$(".vehicle_journey_frequencies.index").ready -> + $( 'body' ).popover({html: true, trigger: "click", selector: '[rel="popover"]'}).on("show.bs.popover", (event)-> + $('[aria-describedby]').click() + $(event.target).data("bs.popover").tip().css("maxWidth", "350px")) diff --git a/app/assets/javascripts/vehicle_journeys/index.js.coffee b/app/assets/javascripts/vehicle_journeys/index.js.coffee index e21580f4e..02de558d4 100644 --- a/app/assets/javascripts/vehicle_journeys/index.js.coffee +++ b/app/assets/javascripts/vehicle_journeys/index.js.coffee @@ -1,4 +1,4 @@ -$(".vehicle_journeys.index, .vehicle_journey_frequencies.index").ready -> +$(".vehicle_journeys.index").ready -> $( 'body' ).popover({html: true, trigger: "focus", selector: 'thead th button'}) .on("show.bs.popover", (event)-> |