浏览代码

release 1.10.1

zhixin 9 年之前
父节点
当前提交
64a7f77d77
共有 100 个文件被更改,包括 367 次插入196 次删除
  1. 1 1
      _config.yml
  2. 46 1
      dist/bootstrap-table-locale-all.js
  3. 2 2
      dist/bootstrap-table-locale-all.min.js
  4. 1 1
      dist/bootstrap-table.css
  5. 16 2
      dist/bootstrap-table.js
  6. 2 2
      dist/bootstrap-table.min.js
  7. 1 1
      dist/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js
  8. 1 1
      dist/extensions/angular/bootstrap-table-angular.min.js
  9. 1 1
      dist/extensions/cookie/bootstrap-table-cookie.min.js
  10. 1 1
      dist/extensions/editable/bootstrap-table-editable.min.js
  11. 1 1
      dist/extensions/export/bootstrap-table-export.min.js
  12. 41 31
      dist/extensions/filter-control/bootstrap-table-filter-control.js
  13. 2 2
      dist/extensions/filter-control/bootstrap-table-filter-control.min.js
  14. 1 1
      dist/extensions/filter/bootstrap-table-filter.min.js
  15. 1 1
      dist/extensions/flat-json/bootstrap-table-flat-json.min.js
  16. 1 1
      dist/extensions/group-by-v2/bootstrap-table-group-by.min.js
  17. 1 1
      dist/extensions/group-by/bootstrap-table-group-by.min.js
  18. 1 1
      dist/extensions/key-events/bootstrap-table-key-events.js
  19. 2 2
      dist/extensions/key-events/bootstrap-table-key-events.min.js
  20. 1 1
      dist/extensions/mobile/bootstrap-table-mobile.min.js
  21. 1 1
      dist/extensions/multiple-search/bootstrap-table-multiple-search.min.js
  22. 1 1
      dist/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
  23. 1 1
      dist/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js
  24. 1 1
      dist/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js
  25. 1 1
      dist/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js
  26. 1 1
      dist/extensions/resizable/bootstrap-table-resizable.min.js
  27. 1 1
      dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js
  28. 1 1
      dist/extensions/toolbar/bootstrap-table-toolbar.min.js
  29. 1 1
      dist/locale/bootstrap-table-af-ZA.min.js
  30. 1 1
      dist/locale/bootstrap-table-ar-SA.min.js
  31. 1 1
      dist/locale/bootstrap-table-ca-ES.min.js
  32. 1 1
      dist/locale/bootstrap-table-cs-CZ.min.js
  33. 1 1
      dist/locale/bootstrap-table-da-DK.min.js
  34. 1 1
      dist/locale/bootstrap-table-de-DE.min.js
  35. 1 1
      dist/locale/bootstrap-table-el-GR.min.js
  36. 1 1
      dist/locale/bootstrap-table-en-US.min.js
  37. 1 1
      dist/locale/bootstrap-table-es-AR.min.js
  38. 1 1
      dist/locale/bootstrap-table-es-CR.min.js
  39. 1 1
      dist/locale/bootstrap-table-es-ES.min.js
  40. 1 1
      dist/locale/bootstrap-table-es-MX.min.js
  41. 1 1
      dist/locale/bootstrap-table-es-NI.min.js
  42. 1 1
      dist/locale/bootstrap-table-es-SP.min.js
  43. 1 1
      dist/locale/bootstrap-table-et-EE.min.js
  44. 1 1
      dist/locale/bootstrap-table-fa-IR.min.js
  45. 1 1
      dist/locale/bootstrap-table-fr-BE.min.js
  46. 1 1
      dist/locale/bootstrap-table-fr-FR.min.js
  47. 43 0
      dist/locale/bootstrap-table-he-IL.js
  48. 7 0
      dist/locale/bootstrap-table-he-IL.min.js
  49. 1 1
      dist/locale/bootstrap-table-hr-HR.min.js
  50. 1 1
      dist/locale/bootstrap-table-hu-HU.min.js
  51. 1 1
      dist/locale/bootstrap-table-it-IT.min.js
  52. 1 1
      dist/locale/bootstrap-table-ja-JP.min.js
  53. 1 1
      dist/locale/bootstrap-table-ka-GE.min.js
  54. 1 1
      dist/locale/bootstrap-table-ko-KR.min.js
  55. 1 1
      dist/locale/bootstrap-table-ms-MY.min.js
  56. 1 1
      dist/locale/bootstrap-table-nb-NO.min.js
  57. 1 1
      dist/locale/bootstrap-table-nl-NL.min.js
  58. 1 1
      dist/locale/bootstrap-table-pl-PL.min.js
  59. 1 1
      dist/locale/bootstrap-table-pt-BR.min.js
  60. 1 1
      dist/locale/bootstrap-table-pt-PT.min.js
  61. 1 1
      dist/locale/bootstrap-table-ro-RO.min.js
  62. 1 1
      dist/locale/bootstrap-table-ru-RU.min.js
  63. 2 2
      dist/locale/bootstrap-table-sk-SK.js
  64. 2 2
      dist/locale/bootstrap-table-sk-SK.min.js
  65. 1 1
      dist/locale/bootstrap-table-sv-SE.min.js
  66. 1 1
      dist/locale/bootstrap-table-th-TH.min.js
  67. 1 1
      dist/locale/bootstrap-table-tr-TR.min.js
  68. 1 1
      dist/locale/bootstrap-table-uk-UA.min.js
  69. 1 1
      dist/locale/bootstrap-table-ur-PK.min.js
  70. 1 1
      dist/locale/bootstrap-table-vi-VN.min.js
  71. 1 1
      dist/locale/bootstrap-table-zh-CN.min.js
  72. 1 1
      dist/locale/bootstrap-table-zh-TW.min.js
  73. 11 28
      docs/_includes/latest-release.md
  74. 46 1
      docs/dist/bootstrap-table-locale-all.js
  75. 2 2
      docs/dist/bootstrap-table-locale-all.min.js
  76. 1 1
      docs/dist/bootstrap-table.css
  77. 16 2
      docs/dist/bootstrap-table.js
  78. 2 2
      docs/dist/bootstrap-table.min.js
  79. 1 1
      docs/dist/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js
  80. 1 1
      docs/dist/extensions/angular/bootstrap-table-angular.min.js
  81. 1 1
      docs/dist/extensions/cookie/bootstrap-table-cookie.min.js
  82. 1 1
      docs/dist/extensions/editable/bootstrap-table-editable.min.js
  83. 1 1
      docs/dist/extensions/export/bootstrap-table-export.min.js
  84. 41 31
      docs/dist/extensions/filter-control/bootstrap-table-filter-control.js
  85. 2 2
      docs/dist/extensions/filter-control/bootstrap-table-filter-control.min.js
  86. 1 1
      docs/dist/extensions/filter/bootstrap-table-filter.min.js
  87. 1 1
      docs/dist/extensions/flat-json/bootstrap-table-flat-json.min.js
  88. 1 1
      docs/dist/extensions/group-by-v2/bootstrap-table-group-by.min.js
  89. 1 1
      docs/dist/extensions/group-by/bootstrap-table-group-by.min.js
  90. 1 1
      docs/dist/extensions/key-events/bootstrap-table-key-events.js
  91. 2 2
      docs/dist/extensions/key-events/bootstrap-table-key-events.min.js
  92. 1 1
      docs/dist/extensions/mobile/bootstrap-table-mobile.min.js
  93. 1 1
      docs/dist/extensions/multiple-search/bootstrap-table-multiple-search.min.js
  94. 1 1
      docs/dist/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
  95. 1 1
      docs/dist/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js
  96. 1 1
      docs/dist/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js
  97. 1 1
      docs/dist/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js
  98. 1 1
      docs/dist/extensions/resizable/bootstrap-table-resizable.min.js
  99. 1 1
      docs/dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js
  100. 0 0
      docs/dist/extensions/toolbar/bootstrap-table-toolbar.min.js

+ 1 - 1
_config.yml

@@ -23,7 +23,7 @@ languages: ["en", "zh-cn", "es"]
 languages_string: ["English", "简体中文", "Español"]
 
 # Custom vars
-current_version: 1.10.0
+current_version: 1.10.1
 repo: https://github.com/wenzhixin/bootstrap-table
 website: http://wenzhixin.net.cn
 repos: http://repos.wenzhixin.net.cn

+ 46 - 1
dist/bootstrap-table-locale-all.js

@@ -706,6 +706,50 @@
 })(jQuery);
 
 /**
+ * Bootstrap Table Hebrew translation
+ * Author: legshooter
+ */
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['he-IL'] = {
+        formatLoadingMessage: function () {
+            return 'טוען, נא להמתין...';
+        },
+        formatRecordsPerPage: function (pageNumber) {
+            return pageNumber + ' שורות בעמוד';
+        },
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+            return 'מציג ' + pageFrom + ' עד ' + pageTo + ' מ-' + totalRows + ' שורות';
+        },
+        formatSearch: function () {
+            return 'חיפוש';
+        },
+        formatNoMatches: function () {
+            return 'לא נמצאו רשומות תואמות';
+        },
+        formatPaginationSwitch: function () {
+            return 'הסתר/הצג מספור דפים';
+        },
+        formatRefresh: function () {
+            return 'רענן';
+        },
+        formatToggle: function () {
+            return 'החלף תצוגה';
+        },
+        formatColumns: function () {
+            return 'עמודות';
+        },
+        formatAllRows: function () {
+            return 'הכל';
+        }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['he-IL']);
+
+})(jQuery);
+
+/**
  * Bootstrap Table Croatian translation
  * Author: Petra Štrbenac (petra.strbenac@gmail.com)
  * Author: Petra Štrbenac (petra.strbenac@gmail.com)
@@ -1292,7 +1336,7 @@
             return 'Vyhľadávanie';
         },
         formatNoMatches: function () {
-            return 'Nenájdená žiadne vyhovujúca položka';
+            return 'Nenájdená žiadna vyhovujúca položka';
         },
         formatRefresh: function () {
             return 'Obnoviť';
@@ -1308,6 +1352,7 @@
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sk-SK']);
 
 })(jQuery);
+
 /**
  * Bootstrap Table Swedish translation
  * Author: C Bratt <bratt@inix.se>

文件差异内容过多而无法显示
+ 2 - 2
dist/bootstrap-table-locale-all.min.js


+ 1 - 1
dist/bootstrap-table.css

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.10.0
+ * version: 1.10.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 

+ 16 - 2
dist/bootstrap-table.js

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.10.0
+ * version: 1.10.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 
@@ -2439,6 +2439,20 @@
         this.checkAll_(false);
     };
 
+    BootstrapTable.prototype.checkInvert = function () {
+        var that = this;
+        var rows = that.$selectItem.filter(':enabled');
+        var checked = rows.filter(':checked');
+        rows.each(function() {
+            $(this).prop('checked', !$(this).prop('checked'));
+        });
+        that.updateRows();
+        that.updateSelected();
+        that.trigger('uncheck-some', checked);
+        checked = that.getSelections();
+        that.trigger('check-some', checked);
+    };
+
     BootstrapTable.prototype.checkAll_ = function (checked) {
         var rows;
         if (!checked) {
@@ -2718,7 +2732,7 @@
         'insertRow', 'updateRow', 'updateCell', 'updateByUniqueId', 'removeByUniqueId',
         'getRowByUniqueId', 'showRow', 'hideRow', 'getRowsHidden',
         'mergeCells',
-        'checkAll', 'uncheckAll',
+        'checkAll', 'uncheckAll', 'checkInvert',
         'check', 'uncheck',
         'checkBy', 'uncheckBy',
         'refresh',

文件差异内容过多而无法显示
+ 2 - 2
dist/bootstrap-table.min.js


+ 1 - 1
dist/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/angular/bootstrap-table-angular.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/cookie/bootstrap-table-cookie.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/editable/bootstrap-table-editable.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/export/bootstrap-table-export.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 41 - 31
dist/extensions/filter-control/bootstrap-table-filter-control.js

@@ -124,6 +124,46 @@
         }
     };
 
+    var initFilterSelectControls = function (bootstrapTable) {
+        var data = bootstrapTable.options.data,
+            itemsPerPage = bootstrapTable.pageTo < bootstrapTable.options.data.length ? bootstrapTable.options.data.length : bootstrapTable.pageTo,
+
+            isColumnSearchableViaSelect = function (column) {
+                return column.filterControl && column.filterControl.toLowerCase() === 'select' && column.searchable;
+            },
+
+            isFilterDataNotGiven = function (column) {
+                return column.filterData === undefined || column.filterData.toLowerCase() === 'column';
+            },
+
+            hasSelectControlElement = function (selectControl) {
+                return selectControl && selectControl.length > 0;
+            };
+
+        for (var i = bootstrapTable.pageFrom - 1; i < bootstrapTable.pageTo; i++) {
+
+            $.each(bootstrapTable.header.fields, function (j, field) {
+                var column = bootstrapTable.columns[$.fn.bootstrapTable.utils.getFieldIndex(bootstrapTable.columns, field)],
+                    selectControl = $('.' + column.field);
+
+
+                if (isColumnSearchableViaSelect(column) && isFilterDataNotGiven(column) && hasSelectControlElement(selectControl)) {
+                    if (selectControl.get(selectControl.length - 1).options.length === 0) {
+                        //Added the default option
+                        addOptionToSelectControl(selectControl, '', '');
+                    }
+
+                    //Added a new value
+                    var fieldValue = data[i][field],
+                        formattedValue = $.fn.bootstrapTable.utils.calculateObjectValue(bootstrapTable.header, bootstrapTable.header.formatters[j], [fieldValue, data[i], i], fieldValue);
+
+                    addOptionToSelectControl(selectControl, fieldValue, formattedValue);
+                }
+            });
+        }
+
+    }
+
     var createControls = function (that, header) {
         var addedFilterControl = false,
             isVisible,
@@ -372,37 +412,7 @@
     BootstrapTable.prototype.initBody = function () {
         _initBody.apply(this, Array.prototype.slice.apply(arguments));
 
-        var that = this,
-            data = this.options.data,
-            pageTo = this.pageTo < this.options.data.length ? this.options.data.length : this.pageTo;
-
-        for (var i = this.pageFrom - 1; i < pageTo; i++) {
-            var item = data[i];
-
-            $.each(this.header.fields, function (j, field) {
-                var value = item[field],
-                    column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)];
-
-                value = $.fn.bootstrapTable.utils.calculateObjectValue(that.header, that.header.formatters[j], [value, item, i], value);
-
-                if ((!column.checkbox) || (!column.radio)) {
-                    if (column.filterControl !== undefined && column.filterControl.toLowerCase() === 'select' && column.searchable) {
-                        if (column.filterData === undefined || column.filterData.toLowerCase() === 'column') {
-                            var selectControl = $('.' + column.field);
-                            if (selectControl !== undefined && selectControl.length > 0) {
-                                if (selectControl.get(selectControl.length - 1).options.length === 0) {
-                                    //Added the default option
-                                    addOptionToSelectControl(selectControl, '', '');
-                                }
-
-                                //Added a new value
-                                addOptionToSelectControl(selectControl, value, value);
-                            }
-                        }
-                    }
-                }
-            });
-        }
+        initFilterSelectControls(this);
     };
 
     BootstrapTable.prototype.initSearch = function () {

文件差异内容过多而无法显示
+ 2 - 2
dist/extensions/filter-control/bootstrap-table-filter-control.min.js


+ 1 - 1
dist/extensions/filter/bootstrap-table-filter.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/flat-json/bootstrap-table-flat-json.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/group-by-v2/bootstrap-table-group-by.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/group-by/bootstrap-table-group-by.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/key-events/bootstrap-table-key-events.js

@@ -32,7 +32,7 @@
                     $toggle = that.$toolbar.find('button[name="toggle"]'),
                     $paginationSwitch = that.$toolbar.find('button[name="paginationSwitch"]');
 
-                if (document.activeElement === $search.get(0)) {
+                if (document.activeElement === $search.get(0) || !$.contains(document.activeElement ,that.$toolbar.get(0))) {
                     return true;
                 }
 

文件差异内容过多而无法显示
+ 2 - 2
dist/extensions/key-events/bootstrap-table-key-events.min.js


+ 1 - 1
dist/extensions/mobile/bootstrap-table-mobile.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/multiple-search/bootstrap-table-multiple-search.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/resizable/bootstrap-table-resizable.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/toolbar/bootstrap-table-toolbar.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-af-ZA.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ar-SA.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ca-ES.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-cs-CZ.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-da-DK.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-de-DE.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-el-GR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-en-US.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-es-AR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-es-CR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-es-ES.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-es-MX.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-es-NI.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-es-SP.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-et-EE.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-fa-IR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-fr-BE.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-fr-FR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 43 - 0
dist/locale/bootstrap-table-he-IL.js

@@ -0,0 +1,43 @@
+/**
+ * Bootstrap Table Hebrew translation
+ * Author: legshooter
+ */
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['he-IL'] = {
+        formatLoadingMessage: function () {
+            return 'טוען, נא להמתין...';
+        },
+        formatRecordsPerPage: function (pageNumber) {
+            return pageNumber + ' שורות בעמוד';
+        },
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+            return 'מציג ' + pageFrom + ' עד ' + pageTo + ' מ-' + totalRows + ' שורות';
+        },
+        formatSearch: function () {
+            return 'חיפוש';
+        },
+        formatNoMatches: function () {
+            return 'לא נמצאו רשומות תואמות';
+        },
+        formatPaginationSwitch: function () {
+            return 'הסתר/הצג מספור דפים';
+        },
+        formatRefresh: function () {
+            return 'רענן';
+        },
+        formatToggle: function () {
+            return 'החלף תצוגה';
+        },
+        formatColumns: function () {
+            return 'עמודות';
+        },
+        formatAllRows: function () {
+            return 'הכל';
+        }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['he-IL']);
+
+})(jQuery);

文件差异内容过多而无法显示
+ 7 - 0
dist/locale/bootstrap-table-he-IL.min.js


+ 1 - 1
dist/locale/bootstrap-table-hr-HR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-hu-HU.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-it-IT.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ja-JP.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ka-GE.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ko-KR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ms-MY.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-nb-NO.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-nl-NL.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-pl-PL.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-pt-BR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-pt-PT.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ro-RO.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ru-RU.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 2 - 2
dist/locale/bootstrap-table-sk-SK.js

@@ -19,7 +19,7 @@
             return 'Vyhľadávanie';
         },
         formatNoMatches: function () {
-            return 'Nenájdená žiadne vyhovujúca položka';
+            return 'Nenájdená žiadna vyhovujúca položka';
         },
         formatRefresh: function () {
             return 'Obnoviť';
@@ -34,4 +34,4 @@
 
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sk-SK']);
 
-})(jQuery);
+})(jQuery);

文件差异内容过多而无法显示
+ 2 - 2
dist/locale/bootstrap-table-sk-SK.min.js


+ 1 - 1
dist/locale/bootstrap-table-sv-SE.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-th-TH.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-tr-TR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-uk-UA.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-ur-PK.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-vi-VN.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-zh-CN.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-zh-TW.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 11 - 28
docs/_includes/latest-release.md

@@ -1,30 +1,13 @@
-### Latest release
+### Latest release (2016-2-17)
 
-#### v{{ site.current_version }} (2016-01-18)
+#### v1.10.1
+
+- revert: feat: update escape to false
+- feat: add `checkInvert` method
+- feat: add `bootstrap-table-he-IL.js`
+- bug: update grunt to development dependency
+- bug: press on toolbar elements, the key-events it will not run
+- bug: remove bogus conditions that will always be true
+- bug: refactor filter control select input initialization
+- bug: typo in Slovak translation
 
-- [bug] Fixed #1619: sub-table checkbox selects all the table.
-- [bug] Fixed icons for ability customizing.
-- [bug] Fixed #1677: paginationSwitch for server-side.
-- [bug] Fixed #1613: padding in footer.
-- [bug] Fixed #1742: showRow & hideRow param checks.
-- [bug] Fixed getItemField bug.
-- [bug] Fixed #617: server side pagination uses `this.options.searchText`.
-- [bug] Fixed class name does not apply to checkbox field bug.
-- [bug] Fixed clear function and searchFormatter option of filter-control extension.
-- [bug] Fixed year computation on cookie extension.
-- [bug] Fixed ReorderRows init when reorderable is false.
-- [bug] Fix #1660: removed powerpoint type of export extension.
-- [enh] Added `title` attribute to pagination controls defining the page number.
-- [enh] Added `escape` option.
-- [enh] Added `searchOnEnterKey` option.
-- [enh] Added `updateFormatText` method.
-- [enh] Added a third parameter to `detailFormatter` method passing the jQuery element.
-- [enh] Added new param for `updateCell` method to avoid table reinitialization.
-- [enh] Removed outline of th.
-- [enh] Added extension.json and composer.json files.
-- [enh] Added alternative group-by extension.
-- [enh] Added sticky-header extension.
-- [enh] Added filterLocal option to filter-control extension.
-- [enh] Enabled data attributes for editable column.
-- [enh] Added IconSize option to export extension.
-- [enh] Added tooltip for filter-control toolbar button.

+ 46 - 1
docs/dist/bootstrap-table-locale-all.js

@@ -706,6 +706,50 @@
 })(jQuery);
 
 /**
+ * Bootstrap Table Hebrew translation
+ * Author: legshooter
+ */
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['he-IL'] = {
+        formatLoadingMessage: function () {
+            return 'טוען, נא להמתין...';
+        },
+        formatRecordsPerPage: function (pageNumber) {
+            return pageNumber + ' שורות בעמוד';
+        },
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+            return 'מציג ' + pageFrom + ' עד ' + pageTo + ' מ-' + totalRows + ' שורות';
+        },
+        formatSearch: function () {
+            return 'חיפוש';
+        },
+        formatNoMatches: function () {
+            return 'לא נמצאו רשומות תואמות';
+        },
+        formatPaginationSwitch: function () {
+            return 'הסתר/הצג מספור דפים';
+        },
+        formatRefresh: function () {
+            return 'רענן';
+        },
+        formatToggle: function () {
+            return 'החלף תצוגה';
+        },
+        formatColumns: function () {
+            return 'עמודות';
+        },
+        formatAllRows: function () {
+            return 'הכל';
+        }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['he-IL']);
+
+})(jQuery);
+
+/**
  * Bootstrap Table Croatian translation
  * Author: Petra Štrbenac (petra.strbenac@gmail.com)
  * Author: Petra Štrbenac (petra.strbenac@gmail.com)
@@ -1292,7 +1336,7 @@
             return 'Vyhľadávanie';
         },
         formatNoMatches: function () {
-            return 'Nenájdená žiadne vyhovujúca položka';
+            return 'Nenájdená žiadna vyhovujúca položka';
         },
         formatRefresh: function () {
             return 'Obnoviť';
@@ -1308,6 +1352,7 @@
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sk-SK']);
 
 })(jQuery);
+
 /**
  * Bootstrap Table Swedish translation
  * Author: C Bratt <bratt@inix.se>

文件差异内容过多而无法显示
+ 2 - 2
docs/dist/bootstrap-table-locale-all.min.js


+ 1 - 1
docs/dist/bootstrap-table.css

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.10.0
+ * version: 1.10.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 

+ 16 - 2
docs/dist/bootstrap-table.js

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.10.0
+ * version: 1.10.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 
@@ -2439,6 +2439,20 @@
         this.checkAll_(false);
     };
 
+    BootstrapTable.prototype.checkInvert = function () {
+        var that = this;
+        var rows = that.$selectItem.filter(':enabled');
+        var checked = rows.filter(':checked');
+        rows.each(function() {
+            $(this).prop('checked', !$(this).prop('checked'));
+        });
+        that.updateRows();
+        that.updateSelected();
+        that.trigger('uncheck-some', checked);
+        checked = that.getSelections();
+        that.trigger('check-some', checked);
+    };
+
     BootstrapTable.prototype.checkAll_ = function (checked) {
         var rows;
         if (!checked) {
@@ -2718,7 +2732,7 @@
         'insertRow', 'updateRow', 'updateCell', 'updateByUniqueId', 'removeByUniqueId',
         'getRowByUniqueId', 'showRow', 'hideRow', 'getRowsHidden',
         'mergeCells',
-        'checkAll', 'uncheckAll',
+        'checkAll', 'uncheckAll', 'checkInvert',
         'check', 'uncheck',
         'checkBy', 'uncheckBy',
         'refresh',

文件差异内容过多而无法显示
+ 2 - 2
docs/dist/bootstrap-table.min.js


+ 1 - 1
docs/dist/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/angular/bootstrap-table-angular.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/cookie/bootstrap-table-cookie.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/editable/bootstrap-table-editable.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/export/bootstrap-table-export.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 41 - 31
docs/dist/extensions/filter-control/bootstrap-table-filter-control.js

@@ -124,6 +124,46 @@
         }
     };
 
+    var initFilterSelectControls = function (bootstrapTable) {
+        var data = bootstrapTable.options.data,
+            itemsPerPage = bootstrapTable.pageTo < bootstrapTable.options.data.length ? bootstrapTable.options.data.length : bootstrapTable.pageTo,
+
+            isColumnSearchableViaSelect = function (column) {
+                return column.filterControl && column.filterControl.toLowerCase() === 'select' && column.searchable;
+            },
+
+            isFilterDataNotGiven = function (column) {
+                return column.filterData === undefined || column.filterData.toLowerCase() === 'column';
+            },
+
+            hasSelectControlElement = function (selectControl) {
+                return selectControl && selectControl.length > 0;
+            };
+
+        for (var i = bootstrapTable.pageFrom - 1; i < bootstrapTable.pageTo; i++) {
+
+            $.each(bootstrapTable.header.fields, function (j, field) {
+                var column = bootstrapTable.columns[$.fn.bootstrapTable.utils.getFieldIndex(bootstrapTable.columns, field)],
+                    selectControl = $('.' + column.field);
+
+
+                if (isColumnSearchableViaSelect(column) && isFilterDataNotGiven(column) && hasSelectControlElement(selectControl)) {
+                    if (selectControl.get(selectControl.length - 1).options.length === 0) {
+                        //Added the default option
+                        addOptionToSelectControl(selectControl, '', '');
+                    }
+
+                    //Added a new value
+                    var fieldValue = data[i][field],
+                        formattedValue = $.fn.bootstrapTable.utils.calculateObjectValue(bootstrapTable.header, bootstrapTable.header.formatters[j], [fieldValue, data[i], i], fieldValue);
+
+                    addOptionToSelectControl(selectControl, fieldValue, formattedValue);
+                }
+            });
+        }
+
+    }
+
     var createControls = function (that, header) {
         var addedFilterControl = false,
             isVisible,
@@ -372,37 +412,7 @@
     BootstrapTable.prototype.initBody = function () {
         _initBody.apply(this, Array.prototype.slice.apply(arguments));
 
-        var that = this,
-            data = this.options.data,
-            pageTo = this.pageTo < this.options.data.length ? this.options.data.length : this.pageTo;
-
-        for (var i = this.pageFrom - 1; i < pageTo; i++) {
-            var item = data[i];
-
-            $.each(this.header.fields, function (j, field) {
-                var value = item[field],
-                    column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)];
-
-                value = $.fn.bootstrapTable.utils.calculateObjectValue(that.header, that.header.formatters[j], [value, item, i], value);
-
-                if ((!column.checkbox) || (!column.radio)) {
-                    if (column.filterControl !== undefined && column.filterControl.toLowerCase() === 'select' && column.searchable) {
-                        if (column.filterData === undefined || column.filterData.toLowerCase() === 'column') {
-                            var selectControl = $('.' + column.field);
-                            if (selectControl !== undefined && selectControl.length > 0) {
-                                if (selectControl.get(selectControl.length - 1).options.length === 0) {
-                                    //Added the default option
-                                    addOptionToSelectControl(selectControl, '', '');
-                                }
-
-                                //Added a new value
-                                addOptionToSelectControl(selectControl, value, value);
-                            }
-                        }
-                    }
-                }
-            });
-        }
+        initFilterSelectControls(this);
     };
 
     BootstrapTable.prototype.initSearch = function () {

文件差异内容过多而无法显示
+ 2 - 2
docs/dist/extensions/filter-control/bootstrap-table-filter-control.min.js


+ 1 - 1
docs/dist/extensions/filter/bootstrap-table-filter.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/flat-json/bootstrap-table-flat-json.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/group-by-v2/bootstrap-table-group-by.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/group-by/bootstrap-table-group-by.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/key-events/bootstrap-table-key-events.js

@@ -32,7 +32,7 @@
                     $toggle = that.$toolbar.find('button[name="toggle"]'),
                     $paginationSwitch = that.$toolbar.find('button[name="paginationSwitch"]');
 
-                if (document.activeElement === $search.get(0)) {
+                if (document.activeElement === $search.get(0) || !$.contains(document.activeElement ,that.$toolbar.get(0))) {
                     return true;
                 }
 

文件差异内容过多而无法显示
+ 2 - 2
docs/dist/extensions/key-events/bootstrap-table-key-events.min.js


+ 1 - 1
docs/dist/extensions/mobile/bootstrap-table-mobile.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/multiple-search/bootstrap-table-multiple-search.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/resizable/bootstrap-table-resizable.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.10.0 - 2016-01-19
+* bootstrap-table - v1.10.1 - 2016-02-17
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2016 zhixin wen
 * Licensed MIT License

+ 0 - 0
docs/dist/extensions/toolbar/bootstrap-table-toolbar.min.js


部分文件因为文件数量过多而无法显示