diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-11 23:56:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-11 23:56:43 +0000 |
| commit | 68d0076415632efd4cc8f238d7ff2868a2c3b400 (patch) | |
| tree | 51bdba70aea068c369673293307f66d026bcf4d6 | |
| parent | f2fab27a562dbb0e1522e388b5719d226ce66e4b (diff) | |
| parent | d4ffe705ebebba49ebaf0652b4430bb459e83eb4 (diff) | |
| download | gitlab-ce-68d0076415632efd4cc8f238d7ff2868a2c3b400.tar.gz | |
Merge branch 'rs-clear-current-timer' into 'master'
Call clearInterval for the currentTimer if one exists
Prevents a double-click from causing the logo to sweep forever after a
load completes.
See merge request !2379
| -rw-r--r-- | app/assets/javascripts/logo.js.coffee | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee index e864a674cdd..a5879c8b793 100644 --- a/app/assets/javascripts/logo.js.coffee +++ b/app/assets/javascripts/logo.js.coffee @@ -21,6 +21,7 @@ start = -> clearHighlights() pieceIndex = 0 pieces.reverse() unless pieces[0] == firstPiece + clearInterval(currentTimer) if currentTimer currentTimer = setInterval(work, delay) stop = -> |