fix: remove some old browser logics

Author: wxsms

src/components/tabs/Tabs.vue

@@ -64,7 +64,6 @@ import {
   isFunction,
   isExist,
   isString,
-  assign,
   hasOwnProperty,
 } from '../../utils/object.utils'
 
@@ -106,11 +105,15 @@ export default {
       const customNavClass = this.customNavClass
       if (isExist(customNavClass)) {
         if (isString(customNavClass)) {
-          return assign({}, tabClasses, {
+          return {
+            ...tabClasses,
             [customNavClass]: true,
-          })
+          }
         } else {
-          return assign({}, tabClasses, customNavClass)
+          return {
+            ...tabClasses,
+            ...customNavClass,
+          }
         }
       } else {
         return tabClasses
@@ -123,11 +126,9 @@ export default {
       const customContentClass = this.customContentClass
       if (isExist(customContentClass)) {
         if (isString(customContentClass)) {
-          return assign({}, contentClasses, {
-            [customContentClass]: true,
-          })
+          return { ...contentClasses, [customContentClass]: true }
         } else {
-          return assign({}, contentClasses, customContentClass)
+          return { ...contentClasses, ...customContentClass }
         }
       } else {
         return contentClasses
@@ -196,7 +197,7 @@ export default {
       }
 
       // return with new classes added to tab
-      return assign(defaultClasses, tab.tabClasses)
+      return { ...defaultClasses, ...tab.tabClasses }
     },
     selectCurrent() {
       let found = false

src/components/typeahead/Typeahead.vue

@@ -36,7 +36,6 @@ import { isString } from '../../utils/object.utils'
 import {
   on,
   off,
-  ensureElementMatchesFunction,
   EVENTS,
   getElementBySelectorOrRef,
 } from '../../utils/dom.utils'
@@ -49,7 +48,7 @@ export default {
       type: null,
       required: true,
     },
-    data: { type: Array, default: () => [] },
+    data: { type: Array, default: undefined },
     itemKey: { type: String, default: undefined },
     appendToBody: {
       type: Boolean,
@@ -143,7 +142,6 @@ export default {
     },
   },
   mounted() {
-    ensureElementMatchesFunction()
     this.$nextTick(() => {
       this.initInputElByTarget(this.target)
       this.initListeners()

src/directives/scrollspy/scrollspy.js

@@ -9,11 +9,10 @@ import {
   getParents,
 } from '../../utils/dom.utils'
 import { nodeListToArray } from '../../utils/array.utils'
-import { assign } from '../../utils/object.utils'
 
 function ScrollSpy(element, target = 'body', options = {}) {
   this.el = element
-  this.opts = assign({}, ScrollSpy.DEFAULTS, options)
+  this.opts = { ...ScrollSpy.DEFAULTS, ...options }
   this.opts.target = target
   if (target === 'body') {
     this.scrollElement = window

src/mixins/locale.mixin.js

@@ -1,5 +1,4 @@
 import { t } from '../locale'
-import { assign } from '../utils/object.utils'
 
 export default {
   methods: {
@@ -8,7 +7,7 @@ export default {
       for (let i = 0; i < arguments.length; ++i) {
         args.push(arguments[i])
       }
-      args[1] = assign({}, { $$locale: this.locale }, args[1])
+      args[1] = { $$locale: this.locale, ...args[1] }
       return t.apply(this, args)
     },
   },

src/mixins/popup.mixin.js

@@ -1,6 +1,5 @@
 import {
   PLACEMENTS,
-  ensureElementMatchesFunction,
   on,
   off,
   EVENTS,
@@ -113,7 +112,6 @@ export default {
     },
   },
   mounted() {
-    ensureElementMatchesFunction()
     removeFromDom(this.$refs.popup)
     this.$nextTick(() => {
       this.initTriggerElByTarget(this.target)

src/utils/dom.utils.js

@@ -113,27 +113,6 @@ export function removeFromDom(el) {
   isElement(el) && isElement(el.parentNode) && el.parentNode.removeChild(el)
 }
 
-export function ensureElementMatchesFunction() {
-  /* istanbul ignore next */
-  if (!Element.prototype.matches) {
-    Element.prototype.matches =
-      Element.prototype.matchesSelector ||
-      Element.prototype.mozMatchesSelector ||
-      Element.prototype.msMatchesSelector ||
-      Element.prototype.oMatchesSelector ||
-      Element.prototype.webkitMatchesSelector ||
-      function (s) {
-        const matches = (this.document || this.ownerDocument).querySelectorAll(
-          s
-        )
-        let i = matches.length
-        // eslint-disable-next-line no-empty
-        while (--i >= 0 && matches.item(i) !== this) {}
-        return i > -1
-      }
-  }
-}
-
 export function addClass(el, className) {
   if (!isElement(el)) {
     return
@@ -405,7 +384,6 @@ export function toggleBodyOverflow(enable) {
 }
 
 export function getClosest(el, selector) {
-  ensureElementMatchesFunction()
   let parent
   let _el = el
   while (_el) {
@@ -419,7 +397,6 @@ export function getClosest(el, selector) {
 }
 
 export function getParents(el, selector, until = null) {
-  ensureElementMatchesFunction()
   const parents = []
   let parent = el.parentElement
   while (parent) {

src/utils/object.utils.js

@@ -1,24 +1,3 @@
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
-export function assign(target, varArgs) {
-  if (target === null || target === undefined) {
-    throw new TypeError('Cannot convert undefined or null to object')
-  }
-  const to = Object(target)
-  for (let index = 1; index < arguments.length; index++) {
-    const nextSource = arguments[index]
-    if (nextSource !== null && nextSource !== undefined) {
-      for (const nextKey in nextSource) {
-        // Avoid bugs when hasOwnProperty is shadowed
-        /* istanbul ignore else */
-        if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
-          to[nextKey] = nextSource[nextKey]
-        }
-      }
-    }
-  }
-  return to
-}
-
 export function isExist(obj) {
   return typeof obj !== 'undefined' && obj !== null
 }

src/utils/object.utils.spec.js

@@ -1,35 +1,6 @@
 import * as utils from './object.utils'
 
 describe('object.utils', () => {
-  describe('#assign', () => {
-    it('should be able to merge objects', () => {
-      expect(utils.assign({}, { a: 1 }, { a: 2, b: 3 })).toEqual({
-        a: 2,
-        b: 3,
-      })
-    })
-
-    it('should be able to handle null target', () => {
-      expect(utils.assign.bind(this, null, {})).toThrow(
-        'Cannot convert undefined or null to object'
-      )
-    })
-
-    it('should be able to handle null or undefined source', () => {
-      expect(
-        utils.assign({}, { a: 1 }, null, undefined, { a: 2, b: 3 })
-      ).toEqual({ a: 2, b: 3 })
-    })
-
-    it('should be able to avoid prototype properties', () => {
-      // eslint-disable-next-line no-new-func
-      const a = new Function()
-      a.prototype.b = 1
-      a.c = 2
-      expect(utils.assign({}, a)).toEqual({ c: 2 })
-    })
-  })
-
   describe('#isExist ', () => {
     it('should be able return false if null', () => {
       expect(utils.isExist(null)).toBeFalsy()