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 2016-02-21 04:20:19 +01:00
commit 3d3e82f7f0
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Changelog.md
View file

@ -122,6 +122,15 @@ Contributions are very welcome, the hard work is done!
* Check for collapsible posts after images in posts have loaded [#6671](https://github.com/diaspora/diaspora/pull/6671) * Check for collapsible posts after images in posts have loaded [#6671](https://github.com/diaspora/diaspora/pull/6671)
* Add reason for post report to email sent to admins [#6679](https://github.com/diaspora/diaspora/pull/6679) * Add reason for post report to email sent to admins [#6679](https://github.com/diaspora/diaspora/pull/6679)
# 0.5.8.0
## Refactor
## Bug fixes
* Fix empty name field when editing aspect names [#6548](https://github.com/diaspora/diaspora/issues/6548)
## Features
# 0.5.7.0 # 0.5.7.0
## Refactor ## Refactor

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

@ -66,6 +66,8 @@ app.pages.Contacts = Backbone.View.extend({
showAspectNameForm: function() { showAspectNameForm: function() {
$(".header > h3").hide(); $(".header > h3").hide();
var aspectName = $.trim($(".header h3 #aspect_name").text());
$("#aspect_name_form #aspect_name").val(aspectName);
$(".header > #aspect_name_form").show(); $(".header > #aspect_name_form").show();
}, },

7
spec/javascripts/app/pages/contacts_spec.js
View file

@ -87,6 +87,13 @@ describe("app.pages.Contacts", function(){
this.button.trigger('click'); this.button.trigger('click');
expect($('.header > h3').css('display')).toBe('none'); expect($('.header > h3').css('display')).toBe('none');
}); });
it("sets the current aspect name as the default value in the form", function() {
$(".header > h3 #aspect_name").text("My awesome unicorn aspect");
expect($("#aspect_name_form input[name='aspect[name]']").val()).not.toBe("My awesome unicorn aspect");
this.button.trigger("click");
expect($("#aspect_name_form input[name='aspect[name]']").val()).toBe("My awesome unicorn aspect");
});
}); });
context('search contact list', function() { context('search contact list', function() {