nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3086 from Raven24/fix-publisher-height

Browse source 
reset publisher css height when "cleared" [ci skip]
This commit is contained in:
Daniel Grippi 2012-04-01 18:24:00 -07:00
commit a45eed13d5
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/views/publisher_view.js
View file

@ -68,7 +68,7 @@ app.views.Publisher = Backbone.View.extend({
open : function() { open : function() {
$(this.el).removeClass('closed'); $(this.el).removeClass('closed');
this.$("#publisher_textarea_wrapper").addClass('active'); this.$("#publisher_textarea_wrapper").addClass('active');
this.$("textarea.ac_input").css('min-height', '42px'); this.$("textarea").css('height', '42px');
return this; return this;
}, },
@ -76,7 +76,7 @@ app.views.Publisher = Backbone.View.extend({
close : function() { close : function() {
$(this.el).addClass("closed"); $(this.el).addClass("closed");
this.$("#publisher_textarea_wrapper").removeClass("active"); this.$("#publisher_textarea_wrapper").removeClass("active");
this.$("textarea.ac_input").css('min-height', ''); this.$("textarea").css('height', '');
return this; return this;
} }

12
spec/javascripts/app/views/publisher_view_spec.js
View file

@ -16,13 +16,19 @@ describe("app.views.Publisher", function() {
}); });
describe("#close", function() { describe("#close", function() {
it("removes the 'active' class from the publisher element", function(){ beforeEach(function() {
$(this.view.el).removeClass("closed"); this.view.open($.Event());
});
expect($(this.view.el)).not.toHaveClass("closed"); it("removes the 'active' class from the publisher element", function(){
this.view.close($.Event()); this.view.close($.Event());
expect($(this.view.el)).toHaveClass("closed"); expect($(this.view.el)).toHaveClass("closed");
}) })
it("resets the element's height", function() {
this.view.close($.Event());
expect($(this.view.el).find("#status_message_fake_text").attr("style")).not.toContain("height");
});
}); });
describe("#clear", function() { describe("#clear", function() {