diff options
| author | Luc Donnet | 2014-10-14 11:38:43 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-10-14 11:38:43 +0200 |
| commit | 2b8c058bc371ce262e53c5ba64cc70f94844c3d7 (patch) | |
| tree | 7c715b2133381627c85ec4d981f1804d860c425c /app/assets/javascripts | |
| parent | 7b2b09622cb7f9283061dba12855e9805f38efde (diff) | |
| download | chouette-core-2b8c058bc371ce262e53c5ba64cc70f94844c3d7.tar.bz2 | |
Refactor popover use for chouette Refs #0029200
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/bootstrap.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/vehicle_journeys/index.js.coffee | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee index 246301696..4cd869397 100644 --- a/app/assets/javascripts/bootstrap.js.coffee +++ b/app/assets/javascripts/bootstrap.js.coffee @@ -1,7 +1,3 @@ jQuery -> - $('[data-toggle="popover"]').click -> - $('[data-toggle="popover"]').not($(this)).popover('hide'); - - $('body').click -> - $('[data-toggle="popover"]').not($(this)).popover('hide'); + diff --git a/app/assets/javascripts/vehicle_journeys/index.js.coffee b/app/assets/javascripts/vehicle_journeys/index.js.coffee index 6c5d30f79..e89c3f519 100644 --- a/app/assets/javascripts/vehicle_journeys/index.js.coffee +++ b/app/assets/javascripts/vehicle_journeys/index.js.coffee @@ -1,12 +1,7 @@ $(".vehicle_journeys.index").ready -> - $('.vehicle_journey_popover') - .click(-> false) # cancel click on <a> tag - .popover({ html : true }) - .on("show.bs.popover", -> - $(this).data("bs.popover").tip().css(maxWidth: "350px")) - $(".route_popover") - .click(-> false) # cancel click on <a> tag - .popover({ html : true }) - .on("show.bs.popover", -> - $(this).data("bs.popover").tip().css(maxWidth: "350px")) + $( 'body' ).popover({html: true, trigger: "focus", selector: 'thead th button'}) + .on("show.bs.popover", (event)-> + $(event.target).data("bs.popover").tip().css("maxWidth", "350px")) + +
\ No newline at end of file |