summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-07-30 09:48:24 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-07-30 09:48:24 +0000
commit42f9bb0e23f7a98e4d2928916783a83fd5965e7b (patch)
tree103788352eaf26a3db11667083b48fa0165bd43f /app
parentf1db513a69503e652ab26cc4f985d9c6588c65cb (diff)
parentd4030094c911c2eba1325cafbbe3eeb4bc7f8e17 (diff)
downloadgitlab-ci-42f9bb0e23f7a98e4d2928916783a83fd5965e7b.tar.gz
Merge branch 'fix_inline_edit_runner_description' into 'master'
Fix inline edit runner-description Fixes: #217 Replaced .show and .hide with .removeClass('hide') and .addClass('hide') (Like done for #192 in MR 177) See merge request !206
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/application.js.coffee8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 8645c78..933ede6 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -28,17 +28,17 @@ $(document).on 'click', '.edit-runner-link', (event) ->
event.preventDefault()
descr = $(this).closest('.runner-description').first()
- descr.hide()
+ descr.addClass('hide')
form = descr.next('.runner-description-form')
descrInput = form.find('input.description')
originalValue = descrInput.val()
- form.show()
+ form.removeClass('hide')
form.find('.cancel').on 'click', (event) ->
event.preventDefault()
- form.hide()
+ form.addClass('hide')
descrInput.val(originalValue)
- descr.show()
+ descr.removeClass('hide')
$(document).on 'click', '.assign-all-runner', ->
$(this).replaceWith('<i class="icon-refresh icon-spin"></i> Assign in progress..')