summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-10 12:01:16 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-10 12:01:51 -0500
commit67a18f34e93ce8aa990794558371096f8f3a4e4c (patch)
tree15c1fbd7a4e373f12d45e465ef8cbf3212336414
parentcb126995aa57cc9e169f875fbd4f9b5b82575a27 (diff)
downloadgitlab-ce-67a18f34e93ce8aa990794558371096f8f3a4e4c.tar.gz
Fix safari logo loading animation safari bug
-rw-r--r--app/assets/javascripts/application.js.coffee7
-rw-r--r--app/assets/javascripts/logo.js.coffee2
2 files changed, 1 insertions, 8 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index e5531c02836..69d4c4f5dd3 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -162,13 +162,6 @@ $ ->
$el.data('placement') || 'bottom'
)
- $('.header-logo .home').tooltip(
- placement: (_, el) ->
- $el = $(el)
- if $('.page-with-sidebar').hasClass('page-sidebar-collapsed') then 'right' else 'bottom'
- container: 'body'
- )
-
# Form submitter
$('.trigger-submit').on 'change', ->
$(@).parents('form').submit()
diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee
index d14b7139237..9fdc27a9787 100644
--- a/app/assets/javascripts/logo.js.coffee
+++ b/app/assets/javascripts/logo.js.coffee
@@ -47,4 +47,4 @@ $ ->
# Make logo clickable as part of a workaround for Safari visited
# link behaviour (See !2690).
$('#logo').on 'click', ->
- $('#js-shortcuts-home').get(0).click()
+ Turbolinks.visit('/')