chore: merge master

This commit is contained in:
Guillaume Chau
2018-05-23 16:39:20 +02:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -79,10 +79,10 @@ const launch = function launch () {
}
}
function defineReactiveSetter ($apollo, key, value) {
function defineReactiveSetter ($apollo, key, value, deep) {
if (typeof value !== 'undefined') {
if (typeof value === 'function') {
$apollo.defineReactiveSetter(key, value)
$apollo.defineReactiveSetter(key, value, deep)
} else {
$apollo[key] = value
}
+1 -1
View File
@@ -4,7 +4,7 @@ import oDebounce from 'throttle-debounce/debounce'
export const Globals = {}
function factory (action) {
return (cb, time) => action(time.cb)
return (cb, time) => action(time, cb)
}
export const throttle = factory(oThrottle)