Skip to content
Extraits de code Groupes Projets
Valider 1cef3e42 rédigé par Hincu Petru's avatar Hincu Petru
Parcourir les fichiers

I save textarea value before rendering comments when clicked 'show more..'

parent 694dc7d8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
## Bug fixes ## Bug fixes
* Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion [#4715](https://github.com/diaspora/diaspora/issues/4715) * Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion [#4715](https://github.com/diaspora/diaspora/issues/4715)
* Save textarea value before rendering comments when clicked 'show more...' [#4514](https://github.com/diaspora/diaspora/issues/4514)
# 0.3.0.0 # 0.3.0.0
## Pod statistics ## Pod statistics
......
...@@ -19,6 +19,7 @@ app.views.CommentStream = app.views.Base.extend({ ...@@ -19,6 +19,7 @@ app.views.CommentStream = app.views.Base.extend({
setupBindings: function() { setupBindings: function() {
this.model.comments.bind('add', this.appendComment, this); this.model.comments.bind('add', this.appendComment, this);
this.model.bind("commentsExpanded", this.storeTextareaValue, this);
this.model.bind("commentsExpanded", this.render, this); this.model.bind("commentsExpanded", this.render, this);
}, },
...@@ -28,6 +29,7 @@ app.views.CommentStream = app.views.Base.extend({ ...@@ -28,6 +29,7 @@ app.views.CommentStream = app.views.Base.extend({
// add autoexpanders to new comment textarea // add autoexpanders to new comment textarea
this.$("textarea").autoResize({'extraSpace' : 10}); this.$("textarea").autoResize({'extraSpace' : 10});
this.$('textarea').val(this.textareaValue);
}, },
presenter: function(){ presenter: function(){
...@@ -73,6 +75,10 @@ app.views.CommentStream = app.views.Base.extend({ ...@@ -73,6 +75,10 @@ app.views.CommentStream = app.views.Base.extend({
this.$("form").removeClass('hidden').addClass("open"); this.$("form").removeClass('hidden').addClass("open");
}, },
storeTextareaValue: function(){
this.textareaValue = this.$('textarea').val();
},
expandComments: function(evt){ expandComments: function(evt){
if(evt){ evt.preventDefault(); } if(evt){ evt.preventDefault(); }
......
...@@ -98,7 +98,10 @@ describe("app.views.CommentStream", function(){ ...@@ -98,7 +98,10 @@ describe("app.views.CommentStream", function(){
this.view.expandComments(); this.view.expandComments();
mostRecentAjaxRequest().response({ comments : [] }); mostRecentAjaxRequest().response({
status: 200,
responseText: JSON.stringify([factory.comment()])
});
expect(this.view.$("textarea").val()).toEqual("great post!"); expect(this.view.$("textarea").val()).toEqual("great post!");
}); });
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter