Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-10-10 16:17:31 +02:00
commit 41440f9459

View file

@ -9,7 +9,7 @@ class Champ < ActiveRecord::Base
end
def data_provide
return 'datepicker' if (type_champ == 'datetime' || type_champ == 'date') && !BROWSER.value.chrome?
return 'datepicker' if (type_champ == 'datetime' || type_champ == 'date') && !(BROWSER.value.chrome? || BROWSER.value.edge?)
return 'typeahead' if type_champ == 'address'
end