Fixed merge conflicts

euvl · Oct 20, 2019 · 59c8fb7 · 59c8fb7
1 parent 5813cf9
commit 59c8fb7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/Notifications.vue b/src/Notifications.vue
@@ -228,13 +228,12 @@ const Component = {
         ? event.speed
         : this.speed
 
-
-      let { title, text, type, data, id, ignoreDuplicates } = event
-
-      const ignoreDuplicates = typeof ignoreDuplicates === 'boolean'
-        ? ignoreDuplicates
+      const ignoreDuplicates = typeof event.ignoreDuplicates === 'boolean'
+        ? event.ignoreDuplicates
         : this.ignoreDuplicates
 
+      let { title, text, type, data, id } = event
+
       const item = {
         id: id || Id(),
         title,
@@ -258,7 +257,10 @@ const Component = {
 
       let indexToDestroy = -1
 
-      const isDuplicate = Boolean(this.active.find(item => item.title === event.title && item.text === event.text));
+      const isDuplicate = this.active.some(item => {
+        return item.title === event.title && item.text === event.text
+      });
+
       const canAdd = ignoreDuplicates ? !isDuplicate : true;
 
       if (!canAdd) return;
@@ -297,9 +299,7 @@ const Component = {
     notifyWrapperStyle (item) {
       return this.isVA
         ? null
-        : {
-            transition: `all ${item.speed}ms`
-          }
+        : { transition: `all ${item.speed}ms` }
     },
 
     destroy (item) {

diff --git a/src/parser.js b/src/parser.js
@@ -10,7 +10,7 @@ const types = [
     regexp: new RegExp(`^${floatRegexp}%$`)
   },
   /**
-   * Fallback optopn
+   * Fallback option
    * If no suffix specified, assigning "px"
    */
   {