瀏覽代碼

Merge pull request #82 from SimoTod/bug/duplicate-callbacks

Fix duplicate callbacks in transitionOut() and transitionIn()
Caleb Porzio 5 年之前
父節點
當前提交
f86f221ce2
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 0 0
      dist/alpine.js
  2. 0 0
      dist/alpine.js.map
  3. 4 4
      src/utils.js

文件差異過大導致無法顯示
+ 0 - 0
dist/alpine.js


文件差異過大導致無法顯示
+ 0 - 0
dist/alpine.js.map


+ 4 - 4
src/utils.js

@@ -125,11 +125,11 @@ export function replaceAtAndColonWithStandardSyntax(name) {
 }
 }
 
 
 export function transitionIn(el, callback, forceSkip = false) {
 export function transitionIn(el, callback, forceSkip = false) {
-    if (forceSkip) callback()
+    if (forceSkip) return callback()
 
 
     const attrs = getXAttrs(el, 'transition')
     const attrs = getXAttrs(el, 'transition')
 
 
-    if (attrs.length < 1) callback()
+    if (attrs.length < 1) return callback()
 
 
     const enter = (attrs.find(i => i.value === 'enter') || { expression: '' }).expression.split(' ').filter(i => i !== '')
     const enter = (attrs.find(i => i.value === 'enter') || { expression: '' }).expression.split(' ').filter(i => i !== '')
     const enterStart = (attrs.find(i => i.value === 'enter-start') || { expression: '' }).expression.split(' ').filter(i => i !== '')
     const enterStart = (attrs.find(i => i.value === 'enter-start') || { expression: '' }).expression.split(' ').filter(i => i !== '')
@@ -139,11 +139,11 @@ export function transitionIn(el, callback, forceSkip = false) {
 }
 }
 
 
 export function transitionOut(el, callback, forceSkip = false) {
 export function transitionOut(el, callback, forceSkip = false) {
-    if (forceSkip) callback()
+    if (forceSkip) return callback()
 
 
     const attrs = getXAttrs(el, 'transition')
     const attrs = getXAttrs(el, 'transition')
 
 
-    if (attrs.length < 1) callback()
+    if (attrs.length < 1) return callback()
 
 
     const leave = (attrs.find(i => i.value === 'leave') || { expression: '' }).expression.split(' ').filter(i => i !== '')
     const leave = (attrs.find(i => i.value === 'leave') || { expression: '' }).expression.split(' ').filter(i => i !== '')
     const leaveStart = (attrs.find(i => i.value === 'leave-start') || { expression: '' }).expression.split(' ').filter(i => i !== '')
     const leaveStart = (attrs.find(i => i.value === 'leave-start') || { expression: '' }).expression.split(' ').filter(i => i !== '')

部分文件因文件數量過多而無法顯示