Browse Source

Update version to 1.6.0

zhixin 11 years ago
parent
commit
8decbedd3e
5 changed files with 64 additions and 50 deletions
  1. 2 0
      CHANGELOG.md
  2. 1 1
      _config.yml
  3. 1 1
      bootstrap-table.jquery.json
  4. 59 47
      bower.json
  5. 1 1
      src/bootstrap-table.js

+ 2 - 0
CHANGELOG.md

@@ -13,6 +13,7 @@
 - [bug] Fix bug of ellipsis string.
 - [bug] Fix pageList smartDisplay.
 - [bug] Fix #188: Export Button is not shown only use `showExport=true`.
+- [bug] Fix page-change event params bug.
 - [enh] Add limit and offset params only if pagination is activated.
 - [enh] Add `ajaxOptions` option to custom $.ajax options.
 - [enh] Add a toggle pagination toolbar button.
@@ -20,6 +21,7 @@
 - [enh] Add `buttonsAlign` option and update `toolbarAlign` option.
 - [enh] Add `prepend`, `insertRow` and `toggleView` methods.
 - [enh] Add `editable-save.bs.table` event to editatble extension.
+- [enh] #431: load method support pagination.
 
 ### 1.5.0
 

+ 1 - 1
_config.yml

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

+ 1 - 1
bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-table",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "title": "Bootstrap Table",
     "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
     "author": {

+ 59 - 47
bower.json

@@ -1,49 +1,61 @@
 {
-  "name": "bootstrap-table",
-  "version": "1.5.0",
-  "homepage": "https://github.com/wenzhixin/bootstrap-table",
-  "authors": [
-    "zhixin <wenzhixin2010@gmail.com>"
-  ],
-  "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
-  "main": [
-      "src/bootstrap-table.css",
-      "src/bootstrap-table.js",
-      "src/locale/bootstrap-table-cs-CZ.js",
-      "src/locale/bootstrap-table-da-DK.js",
-      "src/locale/bootstrap-table-el-GR.js",
-      "src/locale/bootstrap-table-en-US.js",
-      "src/locale/bootstrap-table-es-AR.js",
-      "src/locale/bootstrap-table-es-CR.js",
-      "src/locale/bootstrap-table-es-NI.js",
-      "src/locale/bootstrap-table-fr-BE.js",
-      "src/locale/bootstrap-table-fr-FR.js",
-      "src/locale/bootstrap-table-it-IT.js",
-      "src/locale/bootstrap-table-ko-KR.js",
-      "src/locale/bootstrap-table-nl-NL.js",
-      "src/locale/bootstrap-table-pl-PL.js",
-      "src/locale/bootstrap-table-pt-BR.js",
-      "src/locale/bootstrap-table-ru-RU.js",
-      "src/locale/bootstrap-table-th-TH.js",
-      "src/locale/bootstrap-table-tr-TR.js",
-      "src/locale/bootstrap-table-ur-PK.js",
-      "src/locale/bootstrap-table-vi-VN.js",
-      "src/locale/bootstrap-table-zh-CN.js",
-      "src/locale/bootstrap-table-zh-TW.js"
-  ],
-  "keywords": [
-    "bootstrap",
-    "table",
-    "bootstrap table"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "docs",
-    "assets"
-  ]
+    "name": "bootstrap-table",
+    "version": "1.6.0",
+    "homepage": "https://github.com/wenzhixin/bootstrap-table",
+    "authors": [
+        "zhixin <wenzhixin2010@gmail.com>"
+    ],
+    "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
+    "main": [
+        "src/bootstrap-table.js",
+        "src/bootstrap-table.css",
+        "src/extensions/filter/bootstrap-table-filter.js",
+        "src/extensions/editable/bootstrap-table-editable.js",
+        "src/extensions/export/bootstrap-table-export.js",
+        "src/extensions/flatJSON/bootstrap-table-flatJSON.js",
+        "src/locale/bootstrap-table-zh-CN.js",
+        "src/locale/bootstrap-table-da-DK.js",
+        "src/locale/bootstrap-table-el-GR.js",
+        "src/locale/bootstrap-table-hu-HU.js",
+        "src/locale/bootstrap-table-en-US.js",
+        "src/locale/bootstrap-table-pt-PT.js",
+        "src/locale/bootstrap-table-zh-TW.js",
+        "src/locale/bootstrap-table-pl-PL.js",
+        "src/locale/bootstrap-table-ja-JP.js",
+        "src/locale/bootstrap-table-sv-SE.js",
+        "src/locale/bootstrap-table-ko-KR.js",
+        "src/locale/bootstrap-table-nl-NL.js",
+        "src/locale/bootstrap-table-es-CR.js",
+        "src/locale/bootstrap-table-sk-SK.js",
+        "src/locale/bootstrap-table-ru-RU.js",
+        "src/locale/bootstrap-table-es-AR.js",
+        "src/locale/bootstrap-table-ur-PK.js",
+        "src/locale/bootstrap-table-it-IT.js",
+        "src/locale/bootstrap-table-pt-BR.js",
+        "src/locale/bootstrap-table-es-NI.js",
+        "src/locale/bootstrap-table-tr-TR.js",
+        "src/locale/bootstrap-table-uk-UA.js",
+        "src/locale/bootstrap-table-ms-MY.js",
+        "src/locale/bootstrap-table-fr-FR.js",
+        "src/locale/bootstrap-table-vi-VN.js",
+        "src/locale/bootstrap-table-th-TH.js",
+        "src/locale/bootstrap-table-cs-CZ.js",
+        "src/locale/bootstrap-table-de-DE.js",
+        "src/locale/bootstrap-table-fr-BE.js"
+    ],
+    "keywords": [
+        "bootstrap",
+        "table",
+        "bootstrap table"
+    ],
+    "license": "MIT",
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "test",
+        "tests",
+        "docs",
+        "assets"
+    ]
 }

+ 1 - 1
src/bootstrap-table.js

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