Merge branch 'develop' of https://github.com/xpressengine/xpressengine …

…into develop
xpressengine · Dec 3, 2018 · e2c7549 · e2c7549
2 parents cb0450e + 3ade3c8
commit e2c7549
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/assets/common.js b/assets/common.js
diff --git a/resources/assets/core/form/entity.js b/resources/assets/core/form/entity.js
@@ -43,14 +43,11 @@ class formEntity {
 
     this.$element.on('submit', function (event) {
       if (that.$$hasListener('submit')) {
-        // 폼 전송 이벤트를 중단
-        event.preventDefault()
-
         emitFormSubmit(that.element, event)
           .then(() => {
-            // preventSubmit()으로 임의로 중단하지 않은 경우 폼 전송
-            if (!that.submitPrevented()) {
-              that.submit()
+            // preventSubmit()으로 임의 중단한 경우 폼 전송 중지
+            if (that.submitPrevented()) {
+              event.preventDefault()
             }
           })
           .catch(() => {