github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 09:57:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

A couple of small but important fixes for later Ember releases

Browse Source
This commit is contained in:
Robin Ward
2016-11-09 11:46:11 -05:00
parent 541c29ff4d
commit 875703a750
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/plugins-index.hbs
View File

@ -1,4 +1,4 @@
{{#if length}} {{#if model.length}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button label="admin.plugins.change_settings" {{d-button label="admin.plugins.change_settings"

9
app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
View File

@ -25,13 +25,18 @@ export function bufferedRender(obj) {
return obj; return obj;
} }
const caller = {}; const caller = {
_didRender: false
};
// True in 1.13 or greater // True in 1.13 or greater
if (Ember.Helper) { if (Ember.Helper) {
caller.didRender = function() { caller.didRender = function() {
this._super(); this._super();
this._customRender(); if (!this._didRender) {
this._customRender();
}
this._didRender = true;
}; };
} else { } else {
caller.didInsertElement = function() { caller.didInsertElement = function() {