Merge branch 'next-minor' into develop

Changelog.md

@@ -27,6 +27,7 @@
 * Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085)
 * Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088)
 * Prevent overflow of interaction avatars in the single post view [#7070](https://github.com/diaspora/diaspora/pull/7070)
+* Fix moving publisher on first click after page load [#7094](https://github.com/diaspora/diaspora/pull/7094)
 
 ## Features
 * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

app/assets/javascripts/app/views/publisher_view.js

@@ -443,6 +443,7 @@ app.views.Publisher = Backbone.View.extend({
     $(this.el).addClass("closed");
     this.wrapperEl.removeClass("active");
     this.inputEl.css("height", "");
+    autosize.update(this.inputEl);
     this.wrapperEl.removeClass("with-poll");
     return this;
   },

spec/javascripts/app/views/publisher_view_spec.js

@@ -87,6 +87,12 @@ describe("app.views.Publisher", function() {
         expect($(this.view.el).find("#status_message_fake_text").attr("style")).not.toContain("height");
       });
 
+      it("calls autosize.update", function() {
+        spyOn(autosize, "update");
+        this.view.close($.Event());
+        expect(autosize.update).toHaveBeenCalledWith(this.view.inputEl);
+      });
+
       it("should hide the poll container correctly", function() {
         this.view.$el.find(".poll-creator").click();
         expect(this.view.$el.find(".publisher-textarea-wrapper")).toHaveClass("with-poll");