diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-18 08:17:48 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-18 08:17:48 +0100 |
| commit | 3ecb3024a40882896632ff78789713a4552a19ab (patch) | |
| tree | e2a250e2434edde20f3e64431fc39d77a4d45977 /app/assets/javascripts/admin.js.coffee | |
| parent | 07f5a6f107529a932ca7d657a8473cba1afcba05 (diff) | |
| parent | 835f1961e65fe9b4f943b17747b1518c555e8bfd (diff) | |
| download | gitlab-ce-docs_refactor.tar.gz | |
Merge branch 'master' into docs_refactordocs_refactor
Diffstat (limited to 'app/assets/javascripts/admin.js.coffee')
| -rw-r--r-- | app/assets/javascripts/admin.js.coffee | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee index bcb2e6df7c0..eb951f71711 100644 --- a/app/assets/javascripts/admin.js.coffee +++ b/app/assets/javascripts/admin.js.coffee @@ -10,19 +10,19 @@ 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() + 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) -> |