|
|
@ -93,7 +93,7 @@ export default Property.extend({ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
__getFromStyle(style = {}) { |
|
|
__getFromStyle(style = {}) { |
|
|
let result = style; |
|
|
let result = {}; |
|
|
const fromStyle = this.get('fromStyle'); |
|
|
const fromStyle = this.get('fromStyle'); |
|
|
|
|
|
|
|
|
if (fromStyle) { |
|
|
if (fromStyle) { |
|
|
@ -112,9 +112,11 @@ export default Property.extend({ |
|
|
result[prop.getId()] = value || ''; |
|
|
result[prop.getId()] = value || ''; |
|
|
}); |
|
|
}); |
|
|
result = { |
|
|
result = { |
|
|
...style, |
|
|
|
|
|
...result, |
|
|
...result, |
|
|
|
|
|
...style, |
|
|
}; |
|
|
}; |
|
|
|
|
|
} else { |
|
|
|
|
|
result = style; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|