Skip to content

Commit f1ef6cb

Browse files
authored
Merge pull request #143 from sankam-nikolya/master
Conflict with jQuery UI sortable
2 parents ffb8ecc + c34b94f commit f1ef6cb

File tree

9 files changed

+16
-7
lines changed

9 files changed

+16
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Yii2 multiple input change log
22
==============================
33

4+
2.8.2
5+
=====
6+
7+
- Fixed conflict with jQuery UI sortable
8+
49
2.8.1
510
=====
611

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Yii2 widget for handle multiple inputs for an attribute of model and tabular inp
88
[![License](https://poser.pugx.org/unclead/yii2-multiple-input/license)](https://packagist.org/packages/unclead/yii2-multiple-input)
99

1010
## Latest release
11-
The latest stable version of the extension is v2.8.1 Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
11+
The latest stable version of the extension is v2.8.2 Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
1212

1313
## Installation
1414
The preferred way to install this extension is through [composer](http://getcomposer.org/download/).

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"yii2 tabular input"
1010
],
1111
"type": "yii2-extension",
12-
"version": "2.8.1",
12+
"version": "2.8.2",
1313
"license": "BSD-3-Clause",
1414
"support": {
1515
"issues": "https://github.com/unclead/yii2-multiple-input/issues?state=open",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery.multipleInput",
3-
"version": "2.8.1",
3+
"version": "2.8.2",
44
"description": "jQuery multipleInput",
55
"scripts": {
66
"build": "npm install && (gulp || node node_modules/gulp/bin/gulp.js)"

src/assets/src/css/sorting.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,8 @@ tr.placeholder:before {
3939
margin-top: -5px;
4040
left: -5px;
4141
border-right: none;
42+
}
43+
44+
table.multiple-input-list.table-renderer tr > td.list-cell__drag {
45+
width: 35px;
4246
}

src/assets/src/css/sorting.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/src/js/jquery-sortable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,4 +690,4 @@
690690
});
691691
};
692692

693-
}(jQuery, window, 'sortable');
693+
}(jQuery, window, 'sorting');

src/assets/src/js/jquery-sortable.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderers/BaseRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public function render()
314314

315315
if($this->sortable) {
316316
MultipleInputSortableAsset::register($view);
317-
$js .= "$('#{$this->id} table').sortable({containerSelector: 'table', itemPath: '> tbody', itemSelector: 'tr', placeholder: '<tr class=\"placeholder\"/>', handle:'.drag-handle'});";
317+
$js .= "$('#{$this->id} table').sorting({containerSelector: 'table', itemPath: '> tbody', itemSelector: 'tr', placeholder: '<tr class=\"placeholder\"/>', handle:'.drag-handle'});";
318318
}
319319

320320
$view->registerJs($js);

0 commit comments

Comments
 (0)