Skip to content

[stable17] Enable join button by default in public share pages #2456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Nov 12, 2019
Merged

[stable17] Enable join button by default in public share pages #2456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions js/publicshare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@
if ($(window).width() > 1111) {
// Delay showing the Talk sidebar, as if it is shown too soon
// after the page loads (even if it has loaded) there will be no
// transition and the join button will not be enabled.
// transition.
setTimeout(function() {
this.showTalkSidebar().then(function() {
this._$joinRoomButton.prop('disabled', false);
}.bind(this));
this.showTalkSidebar();
}.bind(this), 1000);
}
},
Expand Down Expand Up @@ -81,7 +79,7 @@
'<div class="emptycontent room-not-joined">' +
' <div class="icon icon-talk"></div>' +
' <h2>' + t('spreed', 'Discuss this file') + '</h2>' +
' <button class="primary" disabled="disabled">' + t('spreed', 'Join conversation') + '<span class="icon icon-loading-small hidden"/></button>' +
' <button class="primary">' + t('spreed', 'Join conversation') + '<span class="icon icon-loading-small hidden"/></button>' +
'</div>');

this._$joinRoomButton = this._$roomNotJoinedMessage.find('button');
Expand Down