Skip to content

Commit

Permalink
Fix #22: Fixes for JQuery v2.1.4 & Select2
Browse files Browse the repository at this point in the history
  • Loading branch information
kartik-v committed May 22, 2015
1 parent 1e3afad commit a938210
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
3 changes: 2 additions & 1 deletion CHANGE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version 1.4.1
=============
**Date:** 20-Apr-2015
**Date:** 22-May-2015

1. (enh #19): New `depdrop_all_params` that will be sent as an associative array (keys & values) to the server ajax action.
2. (enh #20): Ability to configure `id` and `name` param names in json response.
3. (bug kartik-v/yii2-widget-depdrop#10): Fix process dependency params.
4. (enh #22): Fixes for JQuery v2.1.4 & Select2.

version 1.4.0
=============
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"jquery": ">= 1.9.0"
},
"license": "BSD-3",
"license": "BSD-3-Clause",
"ignore": [
"**/.*",
"node_modules",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A multi level dependent dropdown JQuery plugin that allows nested dependencies.",
"keywords": ["jquery", "dependent", "dropdown", "select", "option"],
"homepage": "https://github.com/kartik-v/dependent-dropdown",
"license": "BSD 3-Clause",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Kartik Visweswaran",
Expand Down
13 changes: 5 additions & 8 deletions css/dependent-dropdown.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
/*!
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014-2015
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015
* @version 1.4.1
*
* Styling for the dependent-dropdown JQuery plugin.
*
* For more JQuery plugins visit http://plugins.krajee.com
* For more Yii related demos visit http://demos.krajee.com
*/
.kv-loading, .select2-container.kv-loading .select2-chosen {
background-image: url('../img/loading.gif');
background-position: right 30px center;
background-repeat: no-repeat;
.kv-loading, .select2-container .kv-loading {
background: url('../img/loading.gif') right 20px center no-repeat;
cursor: wait;
opacity: 0.6;
}

.select2-container.kv-loading .select2-chosen {
background-position: right center;
margin-right: 15px !important;
.select2-container .kv-loading {
background-position: right 0px center;
}
4 changes: 2 additions & 2 deletions css/dependent-dropdown.min.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014-2015
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015
* @version 1.4.1
*
* Styling for the dependent-dropdown JQuery plugin.
*
* For more JQuery plugins visit http://plugins.krajee.com
* For more Yii related demos visit http://demos.krajee.com
*/.kv-loading,.select2-container.kv-loading .select2-chosen{background-image:url(../img/loading.gif);background-position:right 30px center;background-repeat:no-repeat;cursor:wait;opacity:.6}.select2-container.kv-loading .select2-chosen{background-position:right center;margin-right:15px!important}
*/.kv-loading,.select2-container .kv-loading{background:url(../img/loading.gif)right 20px center no-repeat;cursor:wait;opacity:.6}.select2-container .kv-loading{background-position:right 0 center}
5 changes: 4 additions & 1 deletion js/dependent-dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* @copyright © Kartik Visweswaran, Krajee.com, 2014-2015
* @copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015
* @version 1.4.1
*
* A multi level dependent dropdown JQuery plugin. The plugin
Expand Down Expand Up @@ -176,6 +176,9 @@
if (placeholder !== false) {
addOption($select, "", placeholder, defVal);
}
if (isEmpty(data)) {
data = {};
}
$.each(data, function (i, groups) {
if (groups[idParam]) {
addOption($select, groups[idParam], groups[nameParam], defVal);
Expand Down
4 changes: 2 additions & 2 deletions js/dependent-dropdown.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a938210

Please sign in to comment.