Skip to content

Commit

Permalink
Merge pull request #473 from wenzhixin/develop
Browse files Browse the repository at this point in the history
1.4.1
  • Loading branch information
wenzhixin authored Sep 24, 2019
2 parents 9334790 + 8fa178c commit 4a89da2
Show file tree
Hide file tree
Showing 107 changed files with 5,649 additions and 1,984 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
## Changelog

### 1.4.1

- **New:** Added `displayHtml` option.
- **New:** Added `html` type of `getSelects` method.
- **New:** Added level support for single group.
- **New:** Added `filterByDataLength` option.
- **New:** Added `customFilter` option support.
- **New:** Added optgroup `styler` support and updated parameter.
- **New:** Added `check` and `uncheck` methods.
- **New:** Added checkInvert method.
- **New:** Added `es-ES` locale.
- **New:** Added data-* attributes support.
- **New:** Added `disabled` prop of vue component.
- **New:** Added Number support for `v-model` of vue component.
- **Update:** Improved default `width` of select.
- **Update:** Improved `single` select style and label bug.
- **Update:** Improved `v-model` and data of vue component.
- **Update:** Fixed init cannot select all bug.
- **Update:** Fixed refresh method bug.
- **Update:** Fixed `filterAcceptOnEnter` bug with `single` option.
- **Update:** Removed multiple-select png.
- **Update:** Disabled `esc` action when `keepOpen` is true.

### 1.4.0

- **New:** Added `data` support.
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ Multiple select is a jQuery plugin to select multiple elements with checkboxes :

To get started checkout examples and documentation at <http://multiple-select.wenzhixin.net.cn>.

## jsFiddle examples
## Examples

<https://github.com/wenzhixin/multiple-select/issues/255>
* http://multiple-select.wenzhixin.net.cn/examples
* http://multiple-select-live.wenzhixin.net.cn/

## Changelog

Expand Down
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"description": "A jQuery plugin to select multiple elements with checkboxes :)",
"main": [
"dist/multiple-select.min.css",
"dist/multiple-select.min.js",
"dist/multiple-select.png"
"dist/multiple-select.min.js"
],
"keywords": [
"multiple.select",
Expand Down
2 changes: 1 addition & 1 deletion dist/locale/multiple-select-en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$ = $ && $.hasOwnProperty('default') ? $['default'] : $;

/**
* Multiple Select English translation
* Multiple Select en-US translation
* Author: Zhixin Wen<[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion dist/locale/multiple-select-en-US.min.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* multiple-select - Multiple select is a jQuery plugin to select multiple elements with checkboxes :).
*
* @version v1.4.0
* @version v1.4.1
* @homepage http://multiple-select.wenzhixin.net.cn
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down
30 changes: 30 additions & 0 deletions dist/locale/multiple-select-es-ES.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
typeof define === 'function' && define.amd ? define(['jquery'], factory) :
(global = global || self, factory(global.jQuery));
}(this, function ($) { 'use strict';

$ = $ && $.hasOwnProperty('default') ? $['default'] : $;

/**
* Multiple Select es-ES translation
* Author: Zhixin Wen<[email protected]>
*/

$.fn.multipleSelect.locales['es-ES'] = {
formatSelectAll: function formatSelectAll() {
return '[Seleccionar todo]';
},
formatAllSelected: function formatAllSelected() {
return 'Todos seleccionados';
},
formatCountSelected: function formatCountSelected(count, total) {
return count + ' de ' + total + ' seleccionado';
},
formatNoMatchesFound: function formatNoMatchesFound() {
return 'No se encontraron coincidencias';
}
};
$.extend($.fn.multipleSelect.defaults, $.fn.multipleSelect.locales['es-ES']);

}));
10 changes: 10 additions & 0 deletions dist/locale/multiple-select-es-ES.min.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* multiple-select - Multiple select is a jQuery plugin to select multiple elements with checkboxes :).
*
* @version v1.4.1
* @homepage http://multiple-select.wenzhixin.net.cn
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
*/

(function(a,b){"object"==typeof exports&&"undefined"!=typeof module?b(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],b):(a=a||self,b(a.jQuery))})(this,function(a){'use strict';a=a&&a.hasOwnProperty("default")?a["default"]:a,a.fn.multipleSelect.locales["es-ES"]={formatSelectAll:function(){return"[Seleccionar todo]"},formatAllSelected:function(){return"Todos seleccionados"},formatCountSelected:function(a,b){return a+" de "+b+" seleccionado"},formatNoMatchesFound:function(){return"No se encontraron coincidencias"}},a.extend(a.fn.multipleSelect.defaults,a.fn.multipleSelect.locales["es-ES"])});
2 changes: 1 addition & 1 deletion dist/locale/multiple-select-zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$ = $ && $.hasOwnProperty('default') ? $['default'] : $;

/**
* Multiple Select English translation
* Multiple Select zh-CN translation
* Author: Zhixin Wen<[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion dist/locale/multiple-select-zh-CN.min.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* multiple-select - Multiple select is a jQuery plugin to select multiple elements with checkboxes :).
*
* @version v1.4.0
* @version v1.4.1
* @homepage http://multiple-select.wenzhixin.net.cn
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down
2 changes: 1 addition & 1 deletion dist/locale/multiple-select-zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$ = $ && $.hasOwnProperty('default') ? $['default'] : $;

/**
* Multiple Select English translation
* Multiple Select zh-TW translation
* Author: Zhixin Wen<[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion dist/locale/multiple-select-zh-TW.min.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* multiple-select - Multiple select is a jQuery plugin to select multiple elements with checkboxes :).
*
* @version v1.4.0
* @version v1.4.1
* @homepage http://multiple-select.wenzhixin.net.cn
* @author wenzhixin <[email protected]> (http://wenzhixin.net.cn/)
* @license MIT
Expand Down
Loading

0 comments on commit 4a89da2

Please sign in to comment.