From 21dfb21c412a1ce8eef649602cb001b6b802b9d8 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 31 Jul 2018 10:37:34 +0800
Subject: [PATCH] Use swal.mixin

---
 resources/assets/src/components/user/ClosetItem.vue       | 2 +-
 resources/assets/src/js/layout.js                         | 7 -------
 resources/assets/src/js/notify.js                         | 6 ++++++
 resources/assets/tests/components/user/ClosetItem.test.js | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/resources/assets/src/components/user/ClosetItem.vue b/resources/assets/src/components/user/ClosetItem.vue
index 391fc652..a4f5ff5d 100644
--- a/resources/assets/src/components/user/ClosetItem.vue
+++ b/resources/assets/src/components/user/ClosetItem.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import swal from 'sweetalert2';
+import { swal } from '../../js/notify';
 import toastr from 'toastr';
 import axios from 'axios';
 
diff --git a/resources/assets/src/js/layout.js b/resources/assets/src/js/layout.js
index dc63422d..8cf3e287 100644
--- a/resources/assets/src/js/layout.js
+++ b/resources/assets/src/js/layout.js
@@ -4,13 +4,6 @@ import 'bootstrap-fileinput';
 import 'admin-lte';
 import 'icheck';
 import Vue from 'vue';
-import swal from 'sweetalert2';
-import { trans } from './i18n';
-
-swal.setDefaults({
-    confirmButtonText: trans('general.confirm'),
-    cancelButtonText: trans('general.cancel')
-});
 
 Vue.mixin({
     mounted() {
diff --git a/resources/assets/src/js/notify.js b/resources/assets/src/js/notify.js
index 393e3bb5..83726cf9 100644
--- a/resources/assets/src/js/notify.js
+++ b/resources/assets/src/js/notify.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import sweetalert2 from 'sweetalert2';
 import { trans } from './i18n';
 
 /**
@@ -71,3 +72,8 @@ export function showModal(msg, title = 'Message', type = 'default', options = {}
         destroyOnClose && $(this).remove();
     }).modal(options);
 }
+
+export const swal = sweetalert2.mixin({
+    confirmButtonText: trans('general.confirm'),
+    cancelButtonText: trans('general.cancel')
+});
diff --git a/resources/assets/tests/components/user/ClosetItem.test.js b/resources/assets/tests/components/user/ClosetItem.test.js
index 9987d5bc..70505315 100644
--- a/resources/assets/tests/components/user/ClosetItem.test.js
+++ b/resources/assets/tests/components/user/ClosetItem.test.js
@@ -1,10 +1,10 @@
 import { mount } from '@vue/test-utils';
 import ClosetItem from '@/user/ClosetItem';
 import axios from 'axios';
-import swal from 'sweetalert2';
+import { swal } from '@/../js/notify';
 
 jest.mock('axios');
-jest.mock('sweetalert2');
+jest.mock('@/../js/notify');
 
 function factory(opt = {}) {
     return {