luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: Don't look for isDescriptor on null (related to null proxies) (#5782)

This commit is contained in:
John Cowen 2019-05-03 11:39:32 +01:00 committed by GitHub
parent 88a727b208
commit 4ea660f2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-v2/app/mixins/with-event-source.js
View File

@ -7,18 +7,18 @@ const PREFIX = '_';
export default Mixin.create(WithListeners, {
setProperties: function(model) {
const _model = {};
Object.keys(model).forEach(key => {
Object.keys(model).forEach(prop => {
// here (see comment below on deleting)
if (typeof this[key] !== 'undefined' && this[key].isDescriptor) {
_model[`${PREFIX}${key}`] = model[key];
const meta = this.constructor.metaForProperty(key) || {};
if (this[prop] && this[prop].isDescriptor) {
_model[`${PREFIX}${prop}`] = model[prop];
const meta = this.constructor.metaForProperty(prop) || {};
if (typeof meta.catch === 'function') {
if (typeof _model[`${PREFIX}${key}`].addEventListener === 'function') {
this.listen(_model[`_${key}`], 'error', meta.catch.bind(this));
if (typeof _model[`${PREFIX}${prop}`].addEventListener === 'function') {
this.listen(_model[`_${prop}`], 'error', meta.catch.bind(this));
}
}
} else {
_model[key] = model[key];
_model[prop] = model[prop];
}
});
return this._super(_model);