Merge pull request #5049 from kpcyrd/aspect-edit-fix

Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
This commit is contained in:
Jonne Haß 2014-07-01 14:49:53 +02:00
commit 5a3d329703
2 changed files with 3 additions and 2 deletions

View file

@ -8,8 +8,9 @@
* Fix hiding of poll publisher on close [#5029](https://github.com/diaspora/diaspora/issues/5029)
* Fix padding in user menu [#5047](https://github.com/diaspora/diaspora/pull/5047)
* Fix self-XSS when renaming an aspect [#5048](https://github.com/diaspora/diaspora/pull/5048)
* Fix live updating when renaming an aspect [#5049](https://github.com/diaspora/diaspora/pull/5049)
## Features
## FeatureS
# 0.4.0.1

View file

@ -13,7 +13,7 @@ function updateAspectName(new_name) {
$('input#aspect_name').val(new_name);
}
function updatePageAspectName( an_id, new_name) {
$('ul#aspect_nav [data-guid="'+an_id+'"]').text(new_name);
$('ul#aspect_nav [data-aspect-id="'+an_id+'"] .selectable').text(new_name);
}
$(document).ready(function() {