Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: ensures panel's shareUrl is not erased by topic's shareUrl (#7035)

This commit is contained in:
Joffrey JAFFEUX 2019-02-20 19:33:54 +01:00 committed by GitHub
parent 664e90bd17
commit 28c24631b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/share-panel.js.es6
View File

@ -35,8 +35,10 @@ export default Ember.Component.extend({
return I18n.t("share.topic", { topicTitle }); return I18n.t("share.topic", { topicTitle });
}, },
@computed("topic.shareUrl") @computed("panel.model.shareUrl", "topic.shareUrl")
shareUrl(shareUrl) { shareUrl(forcedShareUrl, shareUrl) {
shareUrl = forcedShareUrl || shareUrl;
if (Ember.isEmpty(shareUrl)) { if (Ember.isEmpty(shareUrl)) {
return; return;
} }