github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 03:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Patch Ember to fix https://github.com/emberjs/ember.js/issues/9805

Browse Source
This commit is contained in:
Robin Ward 2014-12-03 16:41:27 -05:00
parent 52f7f8e471
commit 393607d25c
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
View File

@ -158,11 +158,11 @@ var controllerOpts = {
}.property('allLoaded', 'topics.length'),
footerEducation: function() {
if (!this.get('allLoaded') || this.get('topics.length') > 0 || !Discourse.User.current()) { return ""; }
if (!this.get('allLoaded') || this.get('topics.length') > 0 || !Discourse.User.current()) { return; }
var split = this.get('filter').split('/');
if (split[0] !== 'new' && split[0] !== 'unread' && split[0] !== 'starred') { return ""; }
if (split[0] !== 'new' && split[0] !== 'unread' && split[0] !== 'starred') { return; }
return I18n.t("topics.none.educate." + split[0], {
userPrefsUrl: Discourse.getURL("/users/") + (Discourse.User.currentProp("username_lower")) + "/preferences"

2
app/assets/javascripts/discourse/models/user.js
View File

@ -92,7 +92,7 @@ Discourse.User = Discourse.Model.extend({
desc = I18n.t('user.moderator', {user: name});
return '<i class="fa fa-shield" title="' + desc + '" alt="' + desc + '"></i>';
}
return "";
return null;
}.property('admin','moderator'),
/**

4
vendor/assets/javascripts/development/ember.js vendored
View File

@ -10112,6 +10112,10 @@ enifed("ember-handlebars/string",
@return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
*/
function htmlSafe(str) {
if (str === undefined || str === null) {
return "";
}
if (typeof str !== 'string') {
str = ''+str;
}

4
vendor/assets/javascripts/production/ember.js vendored
View File

@ -9819,6 +9819,10 @@ enifed("ember-handlebars/string",
@return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
*/
function htmlSafe(str) {
if (str === undefined || str === null) {
return "";
}
if (typeof str !== 'string') {
str = ''+str;
}