diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-03 12:59:44 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-03 13:39:00 +0100 |
| commit | 7af67f619a9ce3dab0a66560bc57ccf606077779 (patch) | |
| tree | 31cf4ed022ada447972d728532584c8b4faf85e7 | |
| parent | f08f921d537c68ec0bbfb8a1ae7e905cded1bbad (diff) | |
| download | gitlab-ce-7af67f619a9ce3dab0a66560bc57ccf606077779.tar.gz | |
Combine new javascript Flash methods into one
| -rw-r--r-- | app/assets/javascripts/flash.js.coffee | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee index 5e34b49c20d..9b59d4e57f7 100644 --- a/app/assets/javascripts/flash.js.coffee +++ b/app/assets/javascripts/flash.js.coffee @@ -12,8 +12,5 @@ class @Flash @flash.click -> $(@).fadeOut() @flash.show() - pinToTop: -> - @flash.addClass('flash-pinned') - - raise: -> - @flash.addClass('flash-raised') + pin: -> + @flash.addClass('flash-pinned flash-raised') diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 8eacd05d050..4f559e86378 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -114,8 +114,7 @@ class @Notes unless note.valid if note.award flash = new Flash('You have already used this award emoji !', 'alert') - flash.pinToTop() - flash.raise() + flash.pin() return # render note if it not present in loaded list |