Skip to content

Commit a816efd

Browse files
committed
Update to v2.5.0
1 parent 92c0bd6 commit a816efd

10 files changed

+27
-30
lines changed

CHANGE.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
version 2.5.0
2+
=============
3+
1. New DepDrop widget based on [dependent-dropdown plugin](http://plugins.krajee.com/dependent-dropdown).
4+
2. Upgrade Select2 Widget to v3.4.8 of the `select2` plugin.
5+
16
version 2.4.0
27
=============
3-
1. Upgrade Select2 Widget to v3.4.6 of the `select2` plugin.
4-
2. Star Rating Widget upgraded as a result of the base Krajee StarRating JQuery plugin upgrade.
8+
1. Star Rating Widget upgraded as a result of the base Krajee StarRating JQuery plugin upgrade.
9+
2. Upgrade Select2 Widget to v3.4.6 of the `select2` plugin.
510

611
version 2.3.0
712
=============

lib/select2/bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "select2",
3-
"version": "3.4.6",
3+
"version": "3.4.8",
44
"main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"],
55
"dependencies": {
66
"jquery": ">= 1.7.1"

lib/select2/component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "select2",
33
"repo": "ivaynberg/select2",
44
"description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
5-
"version": "3.4.6",
5+
"version": "3.4.8",
66
"demo": "http://ivaynberg.github.io/select2/",
77
"keywords": [
88
"jquery"

lib/select2/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":
33
"ivaynberg/select2",
44
"description": "Select2 is a jQuery based replacement for select boxes.",
5-
"version": "3.4.6",
5+
"version": "3.4.8",
66
"type": "component",
77
"homepage": "http://ivaynberg.github.io/select2/",
88
"license": "Apache-2.0",

lib/select2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Igor Vaynberg",
66
"repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"},
77
"main": "select2.js",
8-
"version": "3.4.6",
8+
"version": "3.4.8",
99
"jspm": {
1010
"main": "select2",
1111
"files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"],

lib/select2/select2.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Version: @@ver@@ Timestamp: @@timestamp@@
2+
Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
33
*/
44
.select2-container {
55
margin: 0;

lib/select2/select2.jquery.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tag",
1212
"tagging"
1313
],
14-
"version": "3.4.6",
14+
"version": "3.4.8",
1515
"author": {
1616
"name": "Igor Vaynberg",
1717
"url": "https://github.com/ivaynberg"

lib/select2/select2.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Copyright 2012 Igor Vaynberg
33
4-
Version: @@ver@@ Timestamp: @@timestamp@@
4+
Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
55
66
This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
77
General Public License version 2 (the "GPL License"). You may choose either license to govern your
@@ -524,9 +524,9 @@ the specific language governing permissions and limitations under the Apache Lic
524524
var isFunc = $.isFunction(data);
525525
return function (query) {
526526
var t = query.term, filtered = {results: []};
527-
var result = $(isFunc ? data(query) : data);
527+
var result = isFunc ? data(query) : data;
528528
if ($.isArray(result)) {
529-
$(isFunc ? data() : data).each(function () {
529+
$(result).each(function () {
530530
var isObject = this.text !== undefined,
531531
text = isObject ? this.text : this;
532532
if (t === "" || query.matcher(t, text)) {

lib/select2/select2.min.js

+11-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

widgets/Select2.php

-10
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@ class Select2 extends InputWidget
6565
*/
6666
public $data;
6767

68-
/**
69-
* @var boolean whether the widget will be used inside a bootstrap modal window.
70-
* Fixes [issue # 6](https://github.com/kartik-v/yii2-widgets/issues/6) on an
71-
* interoperability issue with bootstrap modal.
72-
*/
73-
public $modal = false;
74-
7568
/**
7669
* @var array the HTML attributes for the input tag. The following options are important:
7770
* - multiple: boolean whether multiple or single item should be selected. Defaults to false.
@@ -182,8 +175,5 @@ public function registerAssets()
182175
}
183176
$this->pluginOptions['width'] = 'resolve';
184177
$this->registerPlugin('select2');
185-
if ($this->modal) {
186-
$view->registerJs("\n$.fn.modal.Constructor.prototype.enforceFocus = function() {};");
187-
}
188178
}
189179
}

0 commit comments

Comments
 (0)