Browse Source

Merge branch 'develop' into feature/5168

Dennis Hernández 5 years ago
parent
commit
e06b4c19fd
3 changed files with 7 additions and 6 deletions
  1. 2 2
      .travis.yml
  2. 0 2
      site/news.md
  3. 5 2
      src/utils/index.js

+ 2 - 2
.travis.yml

@@ -9,10 +9,10 @@ jobs:
       node_js:
         - 12
       name: "Lint src and check docs"
-      before_install:
+      script:
         - cd tools
         - git clone --depth=1 https://github.com/wenzhixin/bootstrap-table-examples
-      script: npm run pre-commit
+        - npm run pre-commit
       if: branch != master AND type = pull_request
 
     - stage: deploy

+ 0 - 2
site/news.md

@@ -10,8 +10,6 @@ description: News and announcements for all things Bootstrap Table, including ne
 
 #### Core
 
-#### Core
-
 - **New:** Added `bootstrap-table` theme without any framework.
 - **New:** Added support for Bootstrap v5.
 - **New:** Added `$index` field for `remove` method.

+ 5 - 2
src/utils/index.js

@@ -76,8 +76,11 @@ export default {
     }
   },
 
-  normalizeAccent (string) {
-    return string.normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+  normalizeAccent (value) {
+    if (typeof value !== 'string') {
+      return value
+    }
+    return value.normalize('NFD').replace(/[\u0300-\u036f]/g, '')
   },
 
   updateFieldGroup (columns) {