From 5162a89898a77f4e6735ce8590a67ba921713008 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 31 Jan 2018 16:22:09 +0200 Subject: [PATCH] Fix JS #660 --- app/views/registrant/sessions/login_mid.haml | 3 ++- app/views/registrar/domains/form/_contacts.haml | 3 ++- app/views/registrar/domains/form/_dnskeys.haml | 5 ++--- app/views/registrar/domains/form/_nameservers.haml | 3 ++- app/views/registrar/payments/pay.html.haml | 3 ++- app/views/registrar/polls/show.haml | 3 ++- app/views/registrar/sessions/login_mid.haml | 3 ++- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/views/registrant/sessions/login_mid.haml b/app/views/registrant/sessions/login_mid.haml index 227ec23af..34da5a2ae 100644 --- a/app/views/registrant/sessions/login_mid.haml +++ b/app/views/registrant/sessions/login_mid.haml @@ -13,7 +13,7 @@ 00007, 60000007, 00000766 :coffee - window.onload = -> + load_listener = -> $('.js-login').attr('disabled', false) status_interval = null @@ -38,3 +38,4 @@ flash_alert(data.responseJSON.message) $('.js-login').attr('disabled', false) ) + window.addEventListener 'load', load_listener diff --git a/app/views/registrar/domains/form/_contacts.haml b/app/views/registrar/domains/form/_contacts.haml index b5a857c98..8e01ffda3 100644 --- a/app/views/registrar/domains/form/_contacts.haml +++ b/app/views/registrar/domains/form/_contacts.haml @@ -22,7 +22,7 @@ = text_field_tag "domain[contacts_attributes][#{k}][code_helper]", contacts.find_by(code: v['code']).try(:search_name), class: 'form-control', data: {autocomplete: search_contacts_registrar_domains_path}, required: true :coffee - window.onload = -> + load_listener = -> clone = $('.js-contact:first').clone() $("#js-domain-contacts").nestedAttributes bindAddTo: $(".add-domain-contact") @@ -41,3 +41,4 @@ $(v).hide() new Autocomplete() $clone: clone + window.addEventListener 'load', load_listener diff --git a/app/views/registrar/domains/form/_dnskeys.haml b/app/views/registrar/domains/form/_dnskeys.haml index 5574ead13..630e16303 100644 --- a/app/views/registrar/domains/form/_dnskeys.haml +++ b/app/views/registrar/domains/form/_dnskeys.haml @@ -68,11 +68,10 @@ class: 'form-control' :coffee - window.onload = -> + load_listener = -> $("#dnskeys").nestedAttributes bindAddTo: $(".add-dnskey") afterAdd: (item) -> item.find('select').each (k, v) -> $(v).val($(v).find('option:first-child').val()) - - + window.addEventListener 'load', load_listener diff --git a/app/views/registrar/domains/form/_nameservers.haml b/app/views/registrar/domains/form/_nameservers.haml index 374a1eaba..75d34b924 100644 --- a/app/views/registrar/domains/form/_nameservers.haml +++ b/app/views/registrar/domains/form/_nameservers.haml @@ -27,6 +27,7 @@ = text_field_tag "domain[nameservers_attributes][#{k}][ipv6]", v['ipv6'], class: 'form-control'#, ipv6: true :coffee - window.onload = -> + load_listener = -> $("#nameservers").nestedAttributes bindAddTo: $(".add-nameserver") + window.addEventListener 'load', load_listener diff --git a/app/views/registrar/payments/pay.html.haml b/app/views/registrar/payments/pay.html.haml index b2c5eaedb..c0fd8b6ad 100644 --- a/app/views/registrar/payments/pay.html.haml +++ b/app/views/registrar/payments/pay.html.haml @@ -6,5 +6,6 @@ :coffeescript - window.onload = -> + load_listener = -> $('.payment-form form').submit() + window.addEventListener 'load', load_listener diff --git a/app/views/registrar/polls/show.haml b/app/views/registrar/polls/show.haml index 4a5ec678c..69e74751b 100644 --- a/app/views/registrar/polls/show.haml +++ b/app/views/registrar/polls/show.haml @@ -82,9 +82,10 @@ %p.bg-info{style: 'padding: 15px;'}= t(:you_have_no_new_messages) :coffee - window.onload = -> + load_listener = -> $(".js-keyrelay-confirm").on "click", -> $(".js-keyrelay-form").submit() $(".js-transfer-confirm").on "click", -> $(".js-transfer-form").submit() + window.addEventListener 'load', load_listener diff --git a/app/views/registrar/sessions/login_mid.haml b/app/views/registrar/sessions/login_mid.haml index 3eb2ef172..78e39a3b7 100644 --- a/app/views/registrar/sessions/login_mid.haml +++ b/app/views/registrar/sessions/login_mid.haml @@ -13,7 +13,7 @@ 00007, 60000007, 00000766 :coffee - window.onload = -> + load_listener = -> $('.js-login').attr('disabled', false) status_interval = null @@ -38,3 +38,4 @@ flash_alert(data.responseJSON.message) $('.js-login').attr('disabled', false) ) + window.addEventListener 'load', load_listener