Skip to content
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.

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

FIX: refactor to take into account new settings regime #155

Merged
merged 1 commit into from
Jun 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default Ember.Component.extend({

@discourseComputed
featuredTags() {
return Discourse.SiteSettings.topic_list_featured_images_tag.split('|');
return this.siteSettings.topic_list_featured_images_tag.split('|');
},

@discourseComputed('topic.tags')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ export default Ember.Component.extend({
setupTitle() {
const showFeaturedTitle = this.get('showFeaturedTitle');
if (showFeaturedTitle) {
const raw = Discourse.SiteSettings.topic_list_featured_title;
const raw = this.siteSettings.topic_list_featured_title;
cookAsync(raw).then((cooked) => this.set('featuredTitle', cooked));
}
},

@discourseComputed
showFeaturedTitle() {
return Discourse.SiteSettings.topic_list_featured_title;
return this.siteSettings.topic_list_featured_title;
},

@discourseComputed
featuredTags() {
return Discourse.SiteSettings.topic_list_featured_images_tag.split('|');
return this.siteSettings.topic_list_featured_images_tag.split('|');
},

@discourseComputed
showFeaturedTags() {
return this.get('featuredTags') &&
Discourse.SiteSettings.topic_list_featured_images_tag_show;
this.siteSettings.topic_list_featured_images_tag_show;
}
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
setupComponent(attrs, component) {
component.set('portfolioEnabled', Discourse.SiteSettings.topic_list_portfolio);
component.set('portfolioEnabled', component.siteSettings.topic_list_portfolio);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
setupComponent(attrs, component) {
component.set('portfolioEnabled', Discourse.SiteSettings.topic_list_portfolio);
component.set('portfolioEnabled', component.siteSettings.topic_list_portfolio);
}
}
25 changes: 14 additions & 11 deletions assets/javascripts/discourse/initializers/preview-edits.js.es6
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import { cookAsync } from 'discourse/lib/text';
export default {
name: 'preview-edits',
initialize (container) {
if (!Discourse.SiteSettings.topic_list_previews_enabled) return;

const siteSettings = container.lookup('site-settings:main');

if (!siteSettings.topic_list_previews_enabled) return;

withPluginApi ('0.8.12', api => {
api.modifyClass ('component:load-more', {
Expand Down Expand Up @@ -78,7 +81,7 @@ export default {
);
this.set ('category', category);
}
if (Discourse.SiteSettings.topic_list_fade_in_time) {
if (this.siteSettings.topic_list_fade_in_time) {
$ ('#list-area').fadeOut (0);
}
},
Expand All @@ -88,9 +91,9 @@ export default {
if (this.get ('tilesStyle') && !this.site.mobileView) {
Ember.run.scheduleOnce ('afterRender', this, this.applyMasonry);
}
if (Discourse.SiteSettings.topic_list_fade_in_time) {
if (this.siteSettings.topic_list_fade_in_time) {
$ ('#list-area').fadeIn (
Discourse.SiteSettings.topic_list_fade_in_time
this.siteSettings.topic_list_fade_in_time
);
}
},
Expand Down Expand Up @@ -166,7 +169,7 @@ export default {

@discourseComputed ('listChanged')
thumbnailFirstXRows () {
return Discourse.SiteSettings.topic_list_thumbnail_first_x_rows;
return this.siteSettings.topic_list_thumbnail_first_x_rows;
},

applyMasonry () {
Expand All @@ -188,7 +191,7 @@ export default {
// transition set to zero on mobile due to undesirable behaviour on mobile safari if > 0
const transDuration = this.get ('site.mobileView')
? 0
: Discourse.SiteSettings.topic_list_tiles_transition_time;
: this.siteSettings.topic_list_tiles_transition_time;
this.$ ('.tiles-grid').masonry ({
itemSelector: '.tiles-grid-item',
transitionDuration: `${transDuration}s`,
Expand Down Expand Up @@ -237,7 +240,7 @@ export default {
this.classNames = ['tiles-grid-item'];

if (
Discourse.SiteSettings.topic_list_tiles_larger_featured_tiles &&
this.siteSettings.topic_list_tiles_larger_featured_tiles &&
topic.tags
) {
if (
Expand Down Expand Up @@ -268,13 +271,13 @@ export default {
});
} else if (
defaultThumbnail &&
Discourse.SiteSettings.topic_list_default_thumbnail_fallback
this.siteSettings.topic_list_default_thumbnail_fallback
) {
this.set ('thumbnails', defaultThumbnail);
}

const obj = PostsCountColumn.create ({topic});
obj.siteSettings = Discourse.SiteSettings;
obj.siteSettings = this.siteSettings;
this.set ('likesHeat', obj.get ('likesHeat'));
},

Expand Down Expand Up @@ -307,7 +310,7 @@ export default {

@discourseComputed
featuredTags () {
return Discourse.SiteSettings.topic_list_featured_images_tag.split (
return this.siteSettings.topic_list_featured_images_tag.split (
'|'
);
},
Expand Down Expand Up @@ -441,7 +444,7 @@ export default {
likeCount ||
this.get ('topic.topic_post_can_like') ||
!this.get ('currentUser') ||
Discourse.SiteSettings.topic_list_show_like_on_current_users_posts
this.siteSettings.topic_list_show_like_on_current_users_posts
) {
actions.push (this._likeButton ());
}
Expand Down