Use swal.mixin
This commit is contained in:
parent
7206f5952b
commit
21dfb21c41
|
|
@ -21,7 +21,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import swal from 'sweetalert2';
|
import { swal } from '../../js/notify';
|
||||||
import toastr from 'toastr';
|
import toastr from 'toastr';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,6 @@ import 'bootstrap-fileinput';
|
||||||
import 'admin-lte';
|
import 'admin-lte';
|
||||||
import 'icheck';
|
import 'icheck';
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import swal from 'sweetalert2';
|
|
||||||
import { trans } from './i18n';
|
|
||||||
|
|
||||||
swal.setDefaults({
|
|
||||||
confirmButtonText: trans('general.confirm'),
|
|
||||||
cancelButtonText: trans('general.cancel')
|
|
||||||
});
|
|
||||||
|
|
||||||
Vue.mixin({
|
Vue.mixin({
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
|
import sweetalert2 from 'sweetalert2';
|
||||||
import { trans } from './i18n';
|
import { trans } from './i18n';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -71,3 +72,8 @@ export function showModal(msg, title = 'Message', type = 'default', options = {}
|
||||||
destroyOnClose && $(this).remove();
|
destroyOnClose && $(this).remove();
|
||||||
}).modal(options);
|
}).modal(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const swal = sweetalert2.mixin({
|
||||||
|
confirmButtonText: trans('general.confirm'),
|
||||||
|
cancelButtonText: trans('general.cancel')
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
import { mount } from '@vue/test-utils';
|
import { mount } from '@vue/test-utils';
|
||||||
import ClosetItem from '@/user/ClosetItem';
|
import ClosetItem from '@/user/ClosetItem';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import swal from 'sweetalert2';
|
import { swal } from '@/../js/notify';
|
||||||
|
|
||||||
jest.mock('axios');
|
jest.mock('axios');
|
||||||
jest.mock('sweetalert2');
|
jest.mock('@/../js/notify');
|
||||||
|
|
||||||
function factory(opt = {}) {
|
function factory(opt = {}) {
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user