From d31ea8f2bd8ff04be739977b3da7158ff78a79c6 Mon Sep 17 00:00:00 2001
From: Florian Staudacher <florian_staudacher@yahoo.de>
Date: Wed, 2 May 2012 00:03:07 +0200
Subject: [PATCH] use back-to-top initializer, fixes #2840
---
app/assets/javascripts/diaspora.js | 1 +
app/assets/javascripts/widgets/back-to-top.js | 2 +-
app/assets/stylesheets/application.css.sass | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/diaspora.js b/app/assets/javascripts/diaspora.js
index adac01509d..749080d423 100644
--- a/app/assets/javascripts/diaspora.js
+++ b/app/assets/javascripts/diaspora.js
@@ -59,6 +59,7 @@
Diaspora.BasePage = function(body) {
$.extend(this, Diaspora.BaseWidget);
$.extend(this, {
+ backToTop: this.instantiate("BackToTop", body.find("#back-to-top")),
directionDetector: this.instantiate("DirectionDetector"),
events: function() { return Diaspora.page.eventsContainer.data("events"); },
flashMessages: this.instantiate("FlashMessages"),
diff --git a/app/assets/javascripts/widgets/back-to-top.js b/app/assets/javascripts/widgets/back-to-top.js
index a76c09439f..bb9a927d2e 100644
--- a/app/assets/javascripts/widgets/back-to-top.js
+++ b/app/assets/javascripts/widgets/back-to-top.js
@@ -11,7 +11,7 @@
self.button.click(self.backToTop);
- var throttledScroll = _.throttle($.proxy(self.throttledScroll, self), 250);
+ var throttledScroll = _.throttle($.proxy(self.toggleVisibility, self), 250);
self.window.scroll(throttledScroll);
});
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index ce7b5dbaf1..06de2f1c88 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -2850,7 +2850,7 @@ a.toggle_selector
:background-color #aaa
&:hover
:opacity 0.85 !important
- &:visible
+ &.visible
:opacity 0.5
.float-right
--
GitLab