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:
Jonne Haß 2015-10-08 10:52:25 +02:00
commit 23099823c1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -98,6 +98,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398) * Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398)
* Expose Unicorn's pid option to our configuration system [#6411](https://github.com/diaspora/diaspora/pull/6411) * Expose Unicorn's pid option to our configuration system [#6411](https://github.com/diaspora/diaspora/pull/6411)
* Add stream of all public posts [#6465](https://github.com/diaspora/diaspora/pull/6465) * Add stream of all public posts [#6465](https://github.com/diaspora/diaspora/pull/6465)
* Reload stream when clicking on already active one [#6466](https://github.com/diaspora/diaspora/pull/6466)
# 0.5.3.1 # 0.5.3.1

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

@ -106,7 +106,11 @@ var app = {
} else { } else {
$(".stream_title").text(link.text()); $(".stream_title").text(link.text());
} }
app.router.navigate(link.attr("href").substring(1) ,true);
// app.router.navigate doesn't tell us if it changed the page,
// so we use Backbone.history.navigate instead.
var change = Backbone.history.navigate(link.attr("href").substring(1) ,true);
if(change === undefined) { Backbone.history.loadUrl(link.attr("href").substring(1)); }
}); });
}, },