Merge branch 'next-minor' into develop

Changelog.md

@@ -23,6 +23,7 @@
 
 ## Features
 * Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418)
+* Add the back-to-top button to all pages [#7729](https://github.com/diaspora/diaspora/pull/7729)
 
 # 0.7.3.1
 

app/assets/javascripts/app/pages/single-post-viewer.js

@@ -5,7 +5,7 @@ app.pages.SinglePostViewer = app.views.Base.extend({
 
   subviews: {
     "#single-post-content": "singlePostContentView",
-    '#single-post-interactions' : 'singlePostInteractionsView'
+    "#single-post-interactions": "singlePostInteractionsView"
   },
 
   initialize: function() {

app/assets/javascripts/app/views/back_to_top_view.js

@@ -12,7 +12,7 @@ app.views.BackToTop = Backbone.View.extend({
 
   backToTop: function(evt) {
     evt.preventDefault();
-    $("html, body").animate({scrollTop: 0});
+    $("html, body").animate({scrollTop: 0}, this.toggleVisibility);
   },
 
   toggleVisibility: function() {

app/assets/stylesheets/base.scss

@@ -70,20 +70,29 @@ pre { word-wrap: break-word; }
   height: 50px;
   line-height: 50px;
   opacity: 0;
+  pointer-events: none;
   position: fixed;
   right: 20px;
+  text-decoration: none;
   transition: opacity ease 400ms;
   width: 50px;
   z-index: 49;
 
   &:hover,
-  &.visible:hover {
+  &:focus,
+  &:active {
     color: $white;
-    opacity: .85;
     text-decoration: none;
   }
 
-  &.visible { opacity: .5; }
+  &.visible {
+    opacity: .5;
+    pointer-events: auto;
+
+    &:hover {
+      opacity: .85;
+    }
+  }
 }
 
 .noscript {

app/views/layouts/application.html.haml

@@ -38,3 +38,5 @@
       %ol.indicator
 
     #flash-container= flash_messages
+
+    %a.entypo-chevron-up.back-to-top#back-to-top{title: t("layouts.application.back_to_top"), href: "#"}

app/views/people/contacts.haml

@@ -17,8 +17,6 @@
             = render partial: 'people/person', locals: hash
         = will_paginate @contacts_of_contact, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
 
-      %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
-
 -if user_signed_in? && @person
   #new_status_message_pane
     = render 'shared/modal',

app/views/people/index.html.haml

@@ -29,8 +29,6 @@
 
           = will_paginate @people, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
 
-        %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
-
     .col-md-4
       - if AppConfig.settings.invitations.open?
         %h4

app/views/people/show.html.haml

@@ -30,8 +30,6 @@
           .loader.hidden
             .spinner
 
-      %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
-
 -if user_signed_in? && @person
   #new_status_message_pane
     = render 'shared/modal',

app/views/streams/main_stream.html.haml

@@ -178,5 +178,3 @@
     .col-md-9
       .stream-container#aspect-stream-container
         = render "aspects/aspect_stream", stream: @stream
-
-      %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}

app/views/tags/show.haml

@@ -33,5 +33,3 @@
         #paginate
           .loader.hidden
             .spinner
-
-      %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}

spec/javascripts/app/views/back_to_top_view_spec.js

@@ -17,7 +17,7 @@ describe("app.views.BackToTop", function() {
     it("scrolls to the top of the page", function() {
       var spy = spyOn($.fn, "animate");
       this.view.backToTop($.Event());
-      expect(spy).toHaveBeenCalledWith({scrollTop: 0});
+      expect(spy).toHaveBeenCalledWith({scrollTop: 0}, jasmine.any(Function));
     });
   });