nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-08-29 21:44:31 +02:00
commit 4f2f3cca59
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -82,7 +82,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307) * Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307)
* Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310) * Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
* Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315) * Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
* Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) * Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360)
## Bug fixes ## Bug fixes
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212) * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)

2
app/assets/javascripts/app/app.js
View file

@ -108,7 +108,7 @@ var app = {
new app.views.AspectMembership({el: this}); new app.views.AspectMembership({el: this});
}); });
app.sidebar = new app.views.Sidebar(); app.sidebar = new app.views.Sidebar();
app.backToTop = new app.views.BackToTop(); app.backToTop = new app.views.BackToTop({el: $(document)});
}, },
/* mixpanel wrapper function */ /* mixpanel wrapper function */

11
spec/javascripts/app/views/back_to_top_view_spec.js
View file

@ -1,7 +1,16 @@
describe("app.views.BackToTop", function() { describe("app.views.BackToTop", function() {
beforeEach(function() { beforeEach(function() {
spec.loadFixture("aspects_index"); spec.loadFixture("aspects_index");
this.view = new app.views.BackToTop(); this.view = new app.views.BackToTop({el: $(document)});
});
describe("events hash", function() {
it("calls backToTop when clicking the back-to-top button", function() {
spyOn(this.view, "backToTop");
this.view.delegateEvents();
this.view.$("#back-to-top").click();
expect(this.view.backToTop).toHaveBeenCalled();
});
}); });
describe("backToTop", function() { describe("backToTop", function() {