diff --git a/app/assets/javascripts/diaspora.js b/app/assets/javascripts/diaspora.js index adac01509d742a7a96fb693f29967f09f984b292..749080d42343e2dacdea9fcae4afbb55873e09b6 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 a76c09439f79a1ddc7b3ef06b59e7d7644713af8..bb9a927d2e3be6b423324ceabac72afbc646be37 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 ce7b5dbaf19d9da99387a4b19101c6debc3c615a..06de2f1c88dd9a6f156598cb9bf4bcea5bb88628 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