IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hack to allow posts to have access to siteSettings

Browse Source
This commit is contained in:
Robin Ward
2015-08-20 11:06:23 -04:00
parent c002845b1a
commit 11d1619e2c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/models/post.js.es6
View File

@@ -11,6 +11,12 @@ const Post = RestModel.extend({
this.set('replyHistory', []); this.set('replyHistory', []);
}, },
@computed()
siteSettings() {
// TODO: Remove this once one instantiate all `Discourse.Post` models via the store.
return Discourse.SiteSettings;
},
shareUrl: function() { shareUrl: function() {
const user = Discourse.User.current(); const user = Discourse.User.current();
const userSuffix = user ? '?u=' + user.get('username_lower') : ''; const userSuffix = user ? '?u=' + user.get('username_lower') : '';

7
app/assets/javascripts/discourse/views/cloaked-collection.js.es6
View File

@@ -1,6 +1,4 @@
/*eslint no-bitwise:0 */ /*eslint no-bitwise:0 */
import CloakedView from 'discourse/views/cloaked';
const CloakedCollectionView = Ember.CollectionView.extend({ const CloakedCollectionView = Ember.CollectionView.extend({
cloakView: Ember.computed.alias('itemViewClass'), cloakView: Ember.computed.alias('itemViewClass'),
topVisible: null, topVisible: null,
@@ -10,7 +8,7 @@ const CloakedCollectionView = Ember.CollectionView.extend({
loadingHTML: 'Loading...', loadingHTML: 'Loading...',
scrollDebounce: 10, scrollDebounce: 10,
init: function() { init() {
const cloakView = this.get('cloakView'), const cloakView = this.get('cloakView'),
idProperty = this.get('idProperty'), idProperty = this.get('idProperty'),
uncloakDefault = !!this.get('uncloakDefault'); uncloakDefault = !!this.get('uncloakDefault');
@@ -19,6 +17,7 @@ const CloakedCollectionView = Ember.CollectionView.extend({
const slackRatio = parseFloat(this.get('slackRatio')); const slackRatio = parseFloat(this.get('slackRatio'));
if (!slackRatio) { this.set('slackRatio', 1.0); } if (!slackRatio) { this.set('slackRatio', 1.0); }
const CloakedView = this.container.lookupFactory('view:cloaked');
this.set('itemViewClass', CloakedView.extend({ this.set('itemViewClass', CloakedView.extend({
classNames: [cloakView + '-cloak'], classNames: [cloakView + '-cloak'],
cloaks: cloakView, cloaks: cloakView,
@@ -26,7 +25,7 @@ const CloakedCollectionView = Ember.CollectionView.extend({
cloaksController: this.get('itemController'), cloaksController: this.get('itemController'),
defaultHeight: this.get('defaultHeight'), defaultHeight: this.get('defaultHeight'),
init: function() { init() {
this._super(); this._super();
if (idProperty) { if (idProperty) {