diff options
| author | jpl | 2017-03-27 14:01:28 +0200 |
|---|---|---|
| committer | jpl | 2017-03-27 14:01:28 +0200 |
| commit | 808bc3f7f84b485f1d6e9f3fa4d43bc58ecd568c (patch) | |
| tree | c564da2f8767b472d1a14e81e43526e57d3e95a9 | |
| parent | 6580da810148d4ff90f69a7581d07c6bd41c1809 (diff) | |
| parent | 82bd86a71ef62a137fa461ab5c932d7c72d781ac (diff) | |
| download | chouette-core-808bc3f7f84b485f1d6e9f3fa4d43bc58ecd568c.tar.bz2 | |
Merge branch 'master' into staging
| -rw-r--r-- | app/assets/javascripts/forms.coffee | 6 | ||||
| -rw-r--r-- | app/views/line_footnotes/edit.html.slim | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/forms.coffee b/app/assets/javascripts/forms.coffee index c8dd69581..d350d4745 100644 --- a/app/assets/javascripts/forms.coffee +++ b/app/assets/javascripts/forms.coffee @@ -28,11 +28,9 @@ isEdge = !isIE && !!window.StyleMedia if isIE || isEdge - $('.formSubmitr').each -> + $(document).on 'click', '.formSubmitr', -> target = $(this).attr('form') - - $(this).on 'click', -> - $('#' + target).submit() + $('#' + target).submit() $(document).on 'ready page:load', togglableFilter $(document).on 'ready page:load', submitMover diff --git a/app/views/line_footnotes/edit.html.slim b/app/views/line_footnotes/edit.html.slim index f368ea918..fcd7a47e0 100644 --- a/app/views/line_footnotes/edit.html.slim +++ b/app/views/line_footnotes/edit.html.slim @@ -19,4 +19,4 @@ .links.nested-linker = link_to_add_association t('footnotes.actions.add_footnote'), form, :footnotes, class: 'btn btn-outline-primary' - = form.button :submit, class: 'btn btn-default formSubmitr', form: 'notes_form' + = form.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'notes_form' |