mirror of
https://github.com/FortAwesome/Font-Awesome.git
synced 2025-04-02 22:59:14 +08:00
Merge e971c6069bb27300f7076a487b9dbac080c4586a into 138f8c3971a7b6059ed12ebcc436602ee72327d5
This commit is contained in:
commit
389d2ab751
@ -1152,8 +1152,14 @@
|
|||||||
for (var _len = arguments.length, definitions = new Array(_len), _key = 0; _key < _len; _key++) {
|
for (var _len = arguments.length, definitions = new Array(_len), _key = 0; _key < _len; _key++) {
|
||||||
definitions[_key] = arguments[_key];
|
definitions[_key] = arguments[_key];
|
||||||
}
|
}
|
||||||
|
var additions = {}
|
||||||
|
try {
|
||||||
|
additions = definitions.reduce(this._pullDefinitions, {});
|
||||||
|
}
|
||||||
|
catch (ex){
|
||||||
|
throw 'Could not find provided icon(s). ' + ex.message
|
||||||
|
}
|
||||||
|
|
||||||
var additions = definitions.reduce(this._pullDefinitions, {});
|
|
||||||
Object.keys(additions).forEach(function (key) {
|
Object.keys(additions).forEach(function (key) {
|
||||||
_this.definitions[key] = _objectSpread2(_objectSpread2({}, _this.definitions[key] || {}), additions[key]);
|
_this.definitions[key] = _objectSpread2(_objectSpread2({}, _this.definitions[key] || {}), additions[key]);
|
||||||
defineIcons(key, additions[key]); // TODO can we stop doing this? We can't get the icons by 'fa-solid' any longer so this probably needs to change
|
defineIcons(key, additions[key]); // TODO can we stop doing this? We can't get the icons by 'fa-solid' any longer so this probably needs to change
|
||||||
|
Loading…
x
Reference in New Issue
Block a user