8000 Merge pull request #6 from wenzhixin/master · diegobdev/bootstrap-table@35132a8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 35132a8

Browse files
djhvscfdjhvscf
committed
Merge pull request wenzhixin#6 from wenzhixin/master
Update my repo
2 parents bd94e58 + bd6b780 commit 35132a8

File tree

74 files changed

+320
-136
lines changed
  • card-view.md
  • columns.md
  • events.md
  • format.md
  • hide-header.md
  • methods.md
  • pagination.md
  • select.md
  • sort.md
  • style.md
  • toolbar.md
  • extensions
  • fr
  • zh-cn
  • assets
  • examples.md
  • src

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    74 files changed

    +320
    -136
    lines changed

    ‎.gitignore

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,3 +1,4 @@
    11
    node_modules
    22
    _gh_pages
    33
    deploy.sh
    4+
    docs_

    ‎CHANGELOG.md

    Lines changed: 15 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,20 @@
    11
    ## ChangeLog
    22

    3+
    ### 1.5.1
    4+
    5+
    - [bug] Fix queryParams bug when use `sidePagination='server'`.
    6+
    - [enh] Add uk-UA, sv-SE, pt-PT locales.
    7+
    - [enh] Add `searchTimeOut` option.
    8+
    - [bug] Fix #220: state column hideColumn bug.
    9+
    - [enh] Add `iconsPrefix` and `icons` options to support custom icons.
    10+
    - [enh] Add i18n support for docs.
    11+
    - [enh] Allow `query` params to be specified during refresh.
    12+
    - [bug] Fix bug of ellipsis string.
    13+
    - [bug] Fix pageList smartDisplay.
    14+
    - [bug] Fix #188: Export Button is not shown only use `showExport=true`.
    15+
    - [enh] Add limit and offset params only if pagination is activated.
    16+
    - [enh] Add `ajaxOptions` option to custom $.ajax options.
    17+
    318
    ### 1.5.0
    419

    520
    - [bug] Fix #144: `onCheck` and `onUncheck` events are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).

    ‎README.md

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,6 +11,8 @@ An extended Bootstrap table with radio, checkbox, sort, pagination, and other ad
    1111

    1212
    To get started, check out http://bootstrap-table.wenzhixin.net.cn!
    1313

    14+
    More examples: https://github.com/wenzhixin/bootstrap-table-examples#examples-list
    15+
    1416
    ## LICENSE
    1517

    1618
    **NOTE:** Bootstrap Table is licensed under the [The MIT License](https://github.com/wenzhixin/bootstrap-table/blob/master/LICENSE). Completely free, you can arbitrarily use and modify this plugin. If this plugin is useful to you, you can **Star** this repo, your support is my biggest motive force, thanks.

    ‎dist/locale/ bootstrap-table-pt-PT.min.js

    Lines changed: 7 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,7 @@
    1+
    /*
    2+
    * bootstrap-table - v1.5.0 - 2014-12-12
    3+
    * https://github.com/wenzhixin/bootstrap-table
    4+
    * Copyright (c) 2014 zhixin wen
    5+
    * Licensed MIT License
    6+
    */
    7+
    !function(a){"use strict";a.fn.bootstrapTable.locales["pt-PT"]={formatLoadingMessage:function(){return"A carregar, aguarde…"},formatRecordsPerPage:function(a){return a+" registos por página"},formatShowingRows:function(a,b,c){return"A mostrar "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Pesquisa"},formatNoMatches:function(){return"Nenhum registo encontrado"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pt-PT"])}(jQuery);

    ‎docs/_i18n/en/documentation/methods.md

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -69,7 +69,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
    6969
    <tr>
    7070
    <td>refresh</td>
    7171
    <td>params</td>
    72-
    <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url.</td>
    72+
    <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url. To supply query params specific to this request, set <code>{query: {foo: 'bar'}}</code></td>
    7373
    </tr>
    7474
    <tr>
    7575
    <td>showLoading</td>

    ‎docs/_i18n/en/documentation/table-options.md

    Lines changed: 7 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -136,6 +136,13 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
    136136
    <td>'json'</td>
    137137
    <td>The type of data that you are expecting back from the server.</td>
    138138
    </tr>
    139+
    <tr>
    140+
    <td>ajaxOptions</td>
    141+
    <td>data-ajax-options</td>
    142+
    <td>Object</td>
    143+
    <td>{}</td>
    144+
    <td>Additional options for submit ajax request. List of values: <a href="http://api.jquery.com/jQuery.ajax">http://api.jquery.com/jQuery.ajax</a>.</td>
    145+
    </tr>
    139146
    <tr>
    140147
    <td>queryParams</td>
    141148
    <td>data-query-params</td>

    ‎docs/_i18n/en/examples/align.md

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2,4 +2,4 @@
    22

    33
    Use `align`, `halign` and `valign` options to set the alignment of the columns and their header. _by [@wenzhixin](https://github.com/wenzhixin)_
    44

    5-
    <iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    5+
    <iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

    ‎docs/_i18n/en/examples/basic.md

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,16 +6,16 @@
    66

    77
    Transform table from an existing, unformatted html table. _by [@wenzhixin](https://github.com/wenzhixin)_
    88

    9-
    <iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    9+
    <iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    1010

    1111
    ## Table from data
    1212

    1313
    Transform table from an existing data. _by [@wenzhixin](https://github.com/wenzhixin)_
    1414

    15-
    <iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    15+
    <iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    1616

    1717
    ## Table from url
    1818

    1919
    Transform table from an url. _by [@wenzhixin](https://github.com/wenzhixin)_
    2020

    21-
    <iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    21+
    <iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

    ‎docs/_i18n/en/examples/card-view.md

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2,4 +2,4 @@
    22

    33
    Use `cardView: true` option to show Card View. _by [@wenzhixin](https://github.com/wenzhixin)_
    44

    5-
    <iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    5+
    <iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

    ‎docs/_i18n/en/examples/columns.md

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,10 +6,10 @@
    66

    77
    Use `showColumns`, `minimumCountColumns` options, and `visible`, `switchable` column options to show the columns menu list use to switch. _by [@wenzhixin](https://github.com/wenzhixin)_
    88

    9-
    <iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    9+
    <iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    1010

    1111
    ## Large Columns
    1212

    1313
    Bootstrap table support large columns, it will auto to show the horizontal scroll bar. _by [@wenzhixin](https://github.com/wenzhixin)_
    1414

    15-
    <iframe width="100%" height="350" src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
    15+
    <iframe width="100%" height="350" data-src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

    0 commit comments

    Comments
     (0)
    0