From 2c9a8b555b1ad7d3867b9abe1e75575cc2ac3c7c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 18 Jan 2017 08:35:38 +0200 Subject: [PATCH] Convert coffeescript to javascript in admin area #341 --- app/views/admin/admin_users/_form.haml | 9 ++++--- app/views/admin/domains/versions.haml | 17 +++++++----- app/views/admin/shared/form/_statuses.haml | 30 +++++++++++++--------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/app/views/admin/admin_users/_form.haml b/app/views/admin/admin_users/_form.haml index ba7203e1e..0904ea99f 100644 --- a/app/views/admin/admin_users/_form.haml +++ b/app/views/admin/admin_users/_form.haml @@ -59,7 +59,8 @@ .col-md-8.text-right = button_tag(t(:save), class: 'btn btn-warning') -:coffee - $("#admin_user_password").removeAttr('required') - $("#admin_user_password_confirmation").removeAttr('required') - +:javascript + window.addEventListener('load', function() { + $("#admin_user_password").removeAttr('required'); + $("#admin_user_password_confirmation").removeAttr('required'); + }); diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml index b4da9165d..408ef9a67 100644 --- a/app/views/admin/domains/versions.haml +++ b/app/views/admin/domains/versions.haml @@ -36,10 +36,15 @@ = render 'admin/domains/partials/version', domain: version.reify, version: version.previous -:coffee - $(document).on 'click', '.js-pending, .js-event', (e) -> - e.preventDefault() +:javascript + window.addEventListener('load', function() { + $(document).on('click', '.js-pending, .js-event', function(e) { + return e.preventDefault(); + }); - $(document).on 'mousedown', '.js-pending, .js-event', (e) -> - target = $(e.target) - target.parents('tr').nextUntil('tr.small' ,'tr.' + this.className).toggle() + $(document).on('mousedown', '.js-pending, .js-event', function(e) { + var target; + target = $(e.target); + return target.parents('tr').nextUntil('tr.small', 'tr.' + this.className).toggle(); + }); + }); diff --git a/app/views/admin/shared/form/_statuses.haml b/app/views/admin/shared/form/_statuses.haml index 27be8d032..44009b518 100644 --- a/app/views/admin/shared/form/_statuses.haml +++ b/app/views/admin/shared/form/_statuses.haml @@ -31,16 +31,22 @@ - value = f.object.new_record? ? '' : f.object.status_notes[s] = text_field_tag "#{model}[status_notes_array][]", value, class: 'form-control' -:coffee - $("#js-statuses").nestedAttributes - bindAddTo: $(".js-add-status") - afterAdd: (el) -> - if el.find('.js-disabled-value') - el.find('.js-disabled-value').remove() - el.find('.js-select').show() - el.find('.hide-when-new').hide() - el.find('.js-destroy-status').show() +:javascript + window.addEventListener('load', function() { + $("#js-statuses").nestedAttributes({ + bindAddTo: $(".js-add-status"), + afterAdd: function(el) { + if (el.find('.js-disabled-value')) { + el.find('.js-disabled-value').remove(); + el.find('.js-select').show(); + el.find('.hide-when-new').hide(); + return el.find('.js-destroy-status').show(); + } + } + }); - $(document).on 'click', '.js-destroy-status', (e) -> - e.preventDefault() - $(this).parents('.panel').remove() + $(document).on('click', '.js-destroy-status', function(e) { + e.preventDefault(); + return $(this).parents('.panel').remove(); + }); + });