Sort tag followings alphabetically, not in reverse, fixes #3986

This commit is contained in:
Jonne Haß 2013-02-21 14:25:38 +01:00
parent 75c67e7d9b
commit 0cf1c2d020
6 changed files with 17 additions and 5 deletions

View file

@ -16,6 +16,7 @@
* Move custom splash page logic into the controller [#3991](https://github.com/diaspora/diaspora/issues/3991)
* Fixed removing images from publisher on the profile and tags pages. [#3995](https://github.com/diaspora/diaspora/pull/3995)
* Wrap text if too long in mobile notifications. [#3990](https://github.com/diaspora/diaspora/pull/3990)
* Sort tag followings alphabetically, not in reverse [#3986](https://github.com/diaspora/diaspora/issues/3986)
# 0.0.3.0

View file

@ -1,8 +1,10 @@
app.collections.TagFollowings = Backbone.Collection.extend({
model: app.models.TagFollowing,
url : "/tag_followings",
comparator: function(first_tf, second_tf) {
return first_tf.get("name") < second_tf.get("name");
},
create : function(model) {
var name = model.name || model.get("name");

View file

@ -73,7 +73,7 @@ app.Router = Backbone.Router.extend({
$("#tags_list").replaceWith(followedTagsView.render().el);
followedTagsView.setupAutoSuggest();
app.tagFollowings.add(preloads.tagFollowings);
app.tagFollowings.reset(preloads.tagFollowings);
if(name) {
var followedTagsAction = new app.views.TagFollowingAction(

View file

@ -14,7 +14,8 @@ app.views.TagFollowingList = app.views.Base.extend({
},
initialize : function(){
this.collection.bind("add", this.appendTagFollowing, this);
this.collection.on("add", this.appendTagFollowing, this);
this.collection.on("reset", this.postRenderTemplate, this);
},
postRenderTemplate : function() {
@ -72,4 +73,4 @@ app.views.TagFollowingList = app.views.Base.extend({
}).render().el);
}
});
});

View file

@ -2,4 +2,4 @@
<form accept-charset="UTF-8" action="/tag_followings" id="new_tag_following" method="post">
<input class="tag_input" type="text" name="name" placeholder="{{t "stream.followed_tag.add_a_tag"}}" />
</form>
</li>
</li>

View file

@ -3,6 +3,14 @@ describe("app.collections.TagFollowings", function(){
this.collection = new app.collections.TagFollowings();
})
describe("comparator", function() {
it("should compare in reverse order", function() {
var a = new app.models.TagFollowing({name: "aaa"}),
b = new app.models.TagFollowing({name: "zzz"})
expect(this.collection.comparator(a, b)).toBe(true)
})
})
describe("create", function(){
it("should not allow duplicates", function(){
this.collection.create({"name":"name"})