This commit close #60

avil13 · Jul 1, 2019 · da55499 · da55499
1 parent 1837dab
commit da55499
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## v2.1.1 (01/07/2019)
+
+#### Bug Fixes:
+
+- [#60](https://github.com/avil13/vue-sweetalert2/issues/60) Custom Styles not working after update
+
+---
+
 ## v2.1.0 (26/06/2019)
 
 #### Bug Fixes:
@@ -10,8 +18,4 @@
 - [#57](https://github.com/avil13/vue-sweetalert2/issues/57) showLoading
 - [#58](https://github.com/avil13/vue-sweetalert2/issues/58) Close sweetalert
 
-#### Enhancements:
-
-- [#60](https://github.com/avil13/vue-sweetalert2/issues/60) Custom Styles not working after update
-
 ---
diff --git a/example/src/App.vue b/example/src/App.vue
@@ -32,7 +32,6 @@ export default class AppComponent extends Vue {
 
     simple() {
         this.$swal('Hello world!');
-        debugger;
     }
 // /*
     success() {

diff --git a/example/src/main.ts b/example/src/main.ts
@@ -4,15 +4,7 @@ import App from './App.vue';
 
 import VueSweetalert2 from './vue-sweetalert2';
 
-Vue.use(VueSweetalert2, {
-    // options
-    buttonsStyling: false,
-    animation: false,
-    customClass: {
-        confirmButton: 'btn btn-primary',
-        cancelButton: 'btn btn-warning',
-    }
- });
+Vue.use(VueSweetalert2);
 
 new Vue({
     el: '#app',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vue-sweetalert2",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "Simple Vue sweetalert2 package",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

diff --git a/src/index.ts b/src/index.ts
@@ -21,15 +21,12 @@ interface VueSweetalert2Options extends SweetAlertOptions {
 
 class VueSweetalert2 {
     static install(vue: Vue | any, options?: VueSweetalert2Options): void {
-        options = {
-            ...(options || {})
-        };
-
-        // const _swal = options ? Swal.mixin(options).fire.bind(Swal) : Swal.fire.bind(Swal);
         const _swal = (...args: [SweetAlertOptions]) => {
-            return options
-                ? Swal.mixin(options).fire.apply(Swal, args)
-                : Swal.fire.apply(Swal, args);
+            if (options) {
+                const mixed = Swal.mixin(options);
+                return  mixed.fire.apply(mixed, args);
+            }
+            return Swal.fire.apply(Swal, args);
         };
 
         for (let k in Swal) {