Comparing version 2.9.0 to 2.10.0
@@ -45,2 +45,6 @@ "use strict"; | ||
if (typeof arg === "undefined") { | ||
return memo; | ||
} | ||
if (!memo.props && (typeof arg === "string" || Array.isArray(arg))) { | ||
@@ -47,0 +51,0 @@ memo.props = arg; |
@@ -45,7 +45,6 @@ "use strict"; | ||
emitEvent: emitEvent, | ||
events: events, | ||
options: options, | ||
props: props | ||
}); | ||
return (0, _objectSpread4.default)({}, newOptions, (0, _defineProperty2.default)({ | ||
return (0, _objectSpread4.default)({}, events.defaultOptions, newOptions, (0, _defineProperty2.default)({ | ||
event: { | ||
@@ -67,3 +66,2 @@ args: emitArgs, | ||
emitEvent = _ref2.emitEvent, | ||
events = _ref2.events, | ||
options = _ref2.options, | ||
@@ -77,3 +75,3 @@ props = _ref2.props; | ||
}); | ||
return Object.assign({}, events.defaultOptions, emitEvent.options, options, wildcardVar, emitArgs && (0, _util.isObject)(emitArgs[0]) ? emitArgs[0] : undefined); | ||
return Object.assign({}, emitEvent.options, options, wildcardVar, emitArgs && (0, _util.isObject)(emitArgs[0]) ? emitArgs[0] : undefined); | ||
} else { | ||
@@ -80,0 +78,0 @@ return options; |
@@ -37,2 +37,6 @@ // Helpers | ||
if (typeof arg === "undefined") { | ||
return memo | ||
} | ||
if ( | ||
@@ -39,0 +43,0 @@ !memo.props && |
@@ -26,3 +26,2 @@ import { propVar } from "./props" | ||
emitEvent, | ||
events, | ||
options, | ||
@@ -33,2 +32,3 @@ props, | ||
return { | ||
...events.defaultOptions, | ||
...newOptions, | ||
@@ -61,3 +61,2 @@ event: { | ||
emitEvent, | ||
events, | ||
options, | ||
@@ -74,3 +73,2 @@ props, | ||
{}, | ||
events.defaultOptions, | ||
emitEvent.options, | ||
@@ -77,0 +75,0 @@ options, |
{ | ||
"name": "dot-event", | ||
"version": "2.9.0", | ||
"version": "2.10.0", | ||
"description": "Powerful event emitter", | ||
@@ -18,3 +18,3 @@ "keywords": [ | ||
"homepage": "https://github.com/dot-event/core#readme", | ||
"cyclops": { | ||
"operations": { | ||
"git": {}, | ||
@@ -21,0 +21,0 @@ "link": {}, |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
117369
2155