From 7e24c5c45afe1ada044a782f27d3f3413043b1e6 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 31 Dec 2015 15:19:13 -0500 Subject: Move broadcast message form to a partial --- app/assets/javascripts/admin.js.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/assets/javascripts/admin.js.coffee') diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee index bcb2e6df7c0..e9a26dd7200 100644 --- a/app/assets/javascripts/admin.js.coffee +++ b/app/assets/javascripts/admin.js.coffee @@ -10,8 +10,7 @@ class @Admin $('body').on 'click', '.js-toggle-colors-link', (e) -> e.preventDefault() - $('.js-toggle-colors-link').hide() - $('.js-toggle-colors-container').show() + $('.js-toggle-colors-container').toggle() $('input#broadcast_message_color').on 'input', -> previewColor = $('input#broadcast_message_color').val() -- cgit v1.2.1 From 12903762d15cef256f579b1ddb692a0254cace52 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 31 Dec 2015 15:56:59 -0500 Subject: Simplify broadcast message JS Also resets the default example message when the user input is blank. --- app/assets/javascripts/admin.js.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts/admin.js.coffee') diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee index e9a26dd7200..eb951f71711 100644 --- a/app/assets/javascripts/admin.js.coffee +++ b/app/assets/javascripts/admin.js.coffee @@ -13,15 +13,16 @@ class @Admin $('.js-toggle-colors-container').toggle() $('input#broadcast_message_color').on 'input', -> - previewColor = $('input#broadcast_message_color').val() + previewColor = $(@).val() $('div.broadcast-message-preview').css('background-color', previewColor) $('input#broadcast_message_font').on 'input', -> - previewColor = $('input#broadcast_message_font').val() + previewColor = $(@).val() $('div.broadcast-message-preview').css('color', previewColor) $('textarea#broadcast_message_message').on 'input', -> - previewMessage = $('textarea#broadcast_message_message').val() + previewMessage = $(@).val() + previewMessage = "Your message here" if previewMessage.trim() == '' $('div.broadcast-message-preview span').text(previewMessage) $('.log-tabs a').click (e) -> -- cgit v1.2.1