mirror of
https://github.com/flynx/actions.js.git
synced 2026-01-05 17:41:18 +00:00
now merging configs via mix(..), not yet sure if this should be here or above...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
83a385ad0a
commit
3a3139cc6f
@ -1311,6 +1311,15 @@ function(){
|
|||||||
|
|
||||||
args.forEach(function(p){
|
args.forEach(function(p){
|
||||||
res = Object.create(mixin.call(res, p))
|
res = Object.create(mixin.call(res, p))
|
||||||
|
|
||||||
|
// merge config...
|
||||||
|
if(p.config){
|
||||||
|
var config = res.config = res.config || Object.create({})
|
||||||
|
|
||||||
|
Object.keys(p.config).forEach(function(k){
|
||||||
|
res.config.__proto__[k] = JSON.parse(JSON.stringify(p.config[k]))
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ig-actions",
|
"name": "ig-actions",
|
||||||
"version": "1.2.1",
|
"version": "1.3.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "actions.js",
|
"main": "actions.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user