Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
dc1bc753
Commit
dc1bc753
authored
Sep 12, 2016
by
Steffen van Bergerem
Committed by
Benjamin Neff
Sep 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix moving publisher on first click after page load
closes #7094 fixes #7093
parent
2c41485a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
Changelog.md
Changelog.md
+1
-0
app/assets/javascripts/app/views/publisher_view.js
app/assets/javascripts/app/views/publisher_view.js
+1
-0
spec/javascripts/app/views/publisher_view_spec.js
spec/javascripts/app/views/publisher_view_spec.js
+6
-0
No files found.
Changelog.md
View file @
dc1bc753
...
...
@@ -19,6 +19,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
View file @
dc1bc753
...
...
@@ -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
View file @
dc1bc753
...
...
@@ -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
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment