Merge branch 'develop' into fix/trigger-search

package.json

@@ -19,11 +19,11 @@
     "npm-run-all": "^4.1.5",
     "rollup": "^1.16.2",
     "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-babel-minify": "^8.0.0",
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-inject": "^3.0.0",
     "rollup-plugin-multi-entry": "^2.1.0",
     "rollup-plugin-node-resolve": "^5.0.4",
+    "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-vue": "^5.0.0",
     "safe-eval": "^0.4.1",
     "sass": "^1.21.0",

rollup.config.js

@@ -2,7 +2,7 @@ import glob from 'glob'
 import babel from 'rollup-plugin-babel'
 import resolve from 'rollup-plugin-node-resolve'
 import commonjs from 'rollup-plugin-commonjs'
-import minify from 'rollup-plugin-babel-minify'
+import { terser } from 'rollup-plugin-terser'
 import inject from 'rollup-plugin-inject'
 import multiEntry from 'rollup-plugin-multi-entry'
 import vue from 'rollup-plugin-vue'
@@ -34,8 +34,12 @@ const plugins = [
 ]
 
 if (process.env.NODE_ENV === 'production') {
-  plugins.push(minify({
-    comments: false
+  plugins.push(terser({
+    output: {
+      comments () {
+        return false
+      }
+    }
   }))
 }
 

site/_includes/scripts.html

@@ -1,6 +1,6 @@
 <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 <script async defer src="https://buttons.github.io/buttons.js"></script>
 
 {%- if page.layout == "docs" -%}

site/_includes/stylesheet.html

@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
 {%- if page.layout == "docs" or page.layout != "examples" -%}
 <!-- Documentation extras -->

site/docs/api/methods.md

@@ -562,7 +562,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter)`.
 
   Go to the a specified `page`.
 
-- **Example:** [Select/Prev/Next Page](https://examples.bootstrap-table.com/#methods/select-prev-next-page.html.html)
+- **Example:** [Select/Prev/Next Page](https://examples.bootstrap-table.com/#methods/select-prev-next-page.html)
 
 ## prevPage
 
@@ -572,7 +572,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter)`.
 
   Go to previous page.
 
-- **Example:** [Select/Prev/Next Page](https://examples.bootstrap-table.com/#methods/select-prev-next-page.html.html)
+- **Example:** [Select/Prev/Next Page](https://examples.bootstrap-table.com/#methods/select-prev-next-page.html)
 
 ## nextPage
 

site/docs/getting-started/introduction.md

@@ -47,7 +47,7 @@ Put it all together and your pages should look like this:
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Hello, Bootstrap Table!</title>
 
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.css">
   </head>
@@ -75,8 +75,8 @@ Put it all together and your pages should look like this:
     </table>
 
     <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
   </body>
 </html>

site/docs/vuejs/browser.md

@@ -68,7 +68,7 @@ In addition to the files that [Quick start](/docs/getting-started/introduction/#
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Hello, Bootstrap Table!</title>
 
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.css">
   </head>
@@ -78,8 +78,8 @@ In addition to the files that [Quick start](/docs/getting-started/introduction/#
     </div>
 
     <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/vue"></script>
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table.min.js"></script>
     <script src="https://unpkg.com/bootstrap-table@{{ site.current_version }}/dist/bootstrap-table-vue.min.js"></script>

src/bootstrap-table.js

@@ -552,7 +552,7 @@ class BootstrapTable {
           )
         )
 
-        html.push(this.constants.html.toolbarDropdownSeperator)
+        html.push(this.constants.html.toolbarDropdownSeparator)
       }
 
       this.columns.forEach((column, i) => {
@@ -2572,7 +2572,7 @@ class BootstrapTable {
     if (!this.options.cardView && this.options.showHeader && this.options.height) {
       this.$tableHeader.show()
       this.resetHeader()
-      padding += this.$header.outerHeight(true)
+      padding += this.$header.outerHeight(true) + 1
     } else {
       this.$tableHeader.hide()
       this.trigger('post-header')

src/constants/index.js

@@ -47,7 +47,7 @@ const CONSTANTS = {
     html: {
       toolbarDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
       toolbarDropdownItem: '<li role="menuitem"><label>%s</label></li>',
-      toolbarDropdownSeperator: '<li class="divider"></li>',
+      toolbarDropdownSeparator: '<li class="divider"></li>',
       pageDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
       pageDropdownItem: '<li role="menuitem" class="%s"><a href="#">%s</a></li>',
       dropdownCaret: '<span class="caret"></span>',
@@ -95,7 +95,7 @@ const CONSTANTS = {
       toolbarDropdownItem: '<label class="dropdown-item">%s</label>',
       pageDropdown: ['<div class="dropdown-menu">', '</div>'],
       pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
-      toolbarDropdownSeperator: '<div class="dropdown-divider"></div>',
+      toolbarDropdownSeparator: '<div class="dropdown-divider"></div>',
       dropdownCaret: '<span class="caret"></span>',
       pagination: ['<ul class="pagination%s">', '</ul>'],
       paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',

src/locale/bootstrap-table-sr-Cyrl-RS.js

@@ -0,0 +1,91 @@
+/**
+ * Bootstrap Table Serbian Cyrilic RS translation
+ * Author: Vladimir Kanazir (vladimir@kanazir.com)
+ */
+
+$.fn.bootstrapTable.locales['sr-Cyrl-RS'] = {
+  formatLoadingMessage () {
+    return 'Молим сачекај'
+  },
+  formatRecordsPerPage (pageNumber) {
+    return `${pageNumber} редова по страни`
+  },
+  formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Приказано ${pageFrom}. - ${pageTo}. од укупног броја редова ${totalRows} (филтрирано од ${totalNotFiltered})`
+    }
+
+    return `Приказано ${pageFrom}. - ${pageTo}. од укупног броја редова ${totalRows}`
+  },
+  formatSRPaginationPreText () {
+    return 'претходна страна'
+  },
+  formatSRPaginationPageText (page) {
+    return `на страну ${page}`
+  },
+  formatSRPaginationNextText () {
+    return 'следећа страна'
+  },
+  formatDetailPagination (totalRows) {
+    return `Приказано ${totalRows} редова`
+  },
+  formatClearSearch () {
+    return 'Обриши претрагу'
+  },
+  formatSearch () {
+    return 'Пронађи'
+  },
+  formatNoMatches () {
+    return 'Није пронађен ни један податак'
+  },
+  formatPaginationSwitch () {
+    return 'Прикажи/сакриј пагинацију'
+  },
+  formatPaginationSwitchDown () {
+    return 'Прикажи пагинацију'
+  },
+  formatPaginationSwitchUp () {
+    return 'Сакриј пагинацију'
+  },
+  formatRefresh () {
+    return 'Освежи'
+  },
+  formatToggle () {
+    return 'Промени приказ'
+  },
+  formatToggleOn () {
+    return 'Прикажи картице'
+  },
+  formatToggleOff () {
+    return 'Сакриј картице'
+  },
+  formatColumns () {
+    return 'Колоне'
+  },
+  formatColumnsToggleAll () {
+    return 'Прикажи/сакриј све'
+  },
+  formatFullscreen () {
+    return 'Цео екран'
+  },
+  formatAllRows () {
+    return 'Све'
+  },
+  formatAutoRefresh () {
+    return 'Аутоматско освежавање'
+  },
+  formatExport () {
+    return 'Извези податке'
+  },
+  formatJumpTo () {
+    return 'Иди'
+  },
+  formatAdvancedSearch () {
+    return 'Напредна претрага'
+  },
+  formatAdvancedCloseButton () {
+    return 'Затвори'
+  }
+}
+
+$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sr-Cyrl-RS'])

src/locale/bootstrap-table-sr-Latn-RS.js

@@ -0,0 +1,91 @@
+/**
+ * Bootstrap Table Serbian Latin RS translation
+ * Author: Vladimir Kanazir (vladimir@kanazir.com)
+ */
+
+$.fn.bootstrapTable.locales['sr-Latn-RS'] = {
+  formatLoadingMessage () {
+    return 'Molim sačekaj'
+  },
+  formatRecordsPerPage (pageNumber) {
+    return `${pageNumber} redova po strani`
+  },
+  formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+    if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered > totalRows) {
+      return `Prikazano ${pageFrom}. - ${pageTo}. od ukupnog broja redova ${totalRows} (filtrirano od ${totalNotFiltered})`
+    }
+
+    return `Prikazano ${pageFrom}. - ${pageTo}. od ukupnog broja redova ${totalRows}`
+  },
+  formatSRPaginationPreText () {
+    return 'prethodna strana'
+  },
+  formatSRPaginationPageText (page) {
+    return `na stranu ${page}`
+  },
+  formatSRPaginationNextText () {
+    return 'sledeća strana'
+  },
+  formatDetailPagination (totalRows) {
+    return `Prikazano ${totalRows} redova`
+  },
+  formatClearSearch () {
+    return 'Obriši pretragu'
+  },
+  formatSearch () {
+    return 'Pronađi'
+  },
+  formatNoMatches () {
+    return 'Nije pronađen ni jedan podatak'
+  },
+  formatPaginationSwitch () {
+    return 'Prikaži/sakrij paginaciju'
+  },
+  formatPaginationSwitchDown () {
+    return 'Prikaži paginaciju'
+  },
+  formatPaginationSwitchUp () {
+    return 'Sakrij paginaciju'
+  },
+  formatRefresh () {
+    return 'Osveži'
+  },
+  formatToggle () {
+    return 'Promeni prikaz'
+  },
+  formatToggleOn () {
+    return 'Prikaži kartice'
+  },
+  formatToggleOff () {
+    return 'Sakrij kartice'
+  },
+  formatColumns () {
+    return 'Kolone'
+  },
+  formatColumnsToggleAll () {
+    return 'Prikaži/sakrij sve'
+  },
+  formatFullscreen () {
+    return 'Ceo ekran'
+  },
+  formatAllRows () {
+    return 'Sve'
+  },
+  formatAutoRefresh () {
+    return 'Automatsko osvežavanje'
+  },
+  formatExport () {
+    return 'Izvezi podatke'
+  },
+  formatJumpTo () {
+    return 'Idi'
+  },
+  formatAdvancedSearch () {
+    return 'Napredna pretraga'
+  },
+  formatAdvancedCloseButton () {
+    return 'Zatvori'
+  }
+}
+
+$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sr-Latn-RS'])

src/themes/bulma/bootstrap-table-bulma.js

@@ -27,7 +27,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
     this.constants.html.toolbarDropdown = ['<div class="dropdown-menu"><div class="dropdown-content">', '</div></div>']
     this.constants.html.toolbarDropdownItem = '<label class="dropdown-item">%s</label>'
-    this.constants.html.toolbarDropdownSeperator = '<li class="dropdown-divider"></li>'
+    this.constants.html.toolbarDropdownSeparator = '<li class="dropdown-divider"></li>'
     this.constants.html.pageDropdown = ['<div class="dropdown-menu"><div class="dropdown-content">', '</div></div>']
     this.constants.html.pageDropdownItem = '<a class="dropdown-item %s" href="#">%s</a>'
     this.constants.html.dropdownCaret = '<span class="icon is-small"><i class="fas fa-angle-down" aria-hidden="true"></i></span>'

src/themes/foundation/bootstrap-table-foundation.js

@@ -25,7 +25,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
     this.constants.html.toolbarDropdown = ['<ul class="dropdown-pane" id="toolbar-columns-id" data-dropdown><ul class="vertical menu">', '</ul></div>']
     this.constants.html.toolbarDropdownItem = '<li><label class="dropdown-item">%s</label></li>'
-    this.constants.html.toolbarDropdownSeperator = '<li><hr></li>'
+    this.constants.html.toolbarDropdownSeparator = '<li><hr></li>'
     this.constants.html.pageDropdown = ['<div class="dropdown-pane" id="pagination-list-id" data-dropdown><ul class="vertical menu">', '</ul></div>']
     this.constants.html.pageDropdownItem = '<li class="dropdown-item %s"><a href="#">%s</a></li>'
     this.constants.html.dropdownCaret = '<i class="fa fa-angle-down"></i>'

src/themes/materialize/bootstrap-table-materialize.js

@@ -40,7 +40,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
     this.constants.html.toolbarDropdown = ['<ul id="toolbar-columns-id" class="dropdown-content">', '</ul>']
     this.constants.html.toolbarDropdownItem = '<li><label>%s</label></li>'
-    this.constants.html.toolbarDropdownSeperator = '<li class="divider" tabindex="-1"></li>'
+    this.constants.html.toolbarDropdownSeparator = '<li class="divider" tabindex="-1"></li>'
     this.constants.html.pageDropdown = ['<ul id="pagination-list-id" class="dropdown-content">', '</ul>']
     this.constants.html.pageDropdownItem = '<li><a class="%s" href="#">%s</a></li>'
     this.constants.html.dropdownCaret = '<i class="material-icons">arrow_drop_down</i>'

src/themes/semantic/bootstrap-table-semantic.js

@@ -23,7 +23,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
 
     this.constants.html.toolbarDropdown = ['<div class="menu">', '</div>']
     this.constants.html.toolbarDropdownItem = '<label class="item">%s</label>'
-    this.constants.html.toolbarDropdownSeperator = '<div class="divider"></div>'
+    this.constants.html.toolbarDropdownSeparator = '<div class="divider"></div>'
     this.constants.html.pageDropdown = ['<div class="menu">', '</div>']
     this.constants.html.pageDropdownItem = '<a class="item %s" href="#">%s</a>'
     this.constants.html.dropdownCaret = '<i class="dropdown icon"></i>'