Browse Source

Merge branch 'master' into gh-pages

gh-pages
RubaXa 10 years ago
parent
commit
7334a5c567
  1. 4
      README.md
  2. 18
      Sortable.js
  3. 4
      Sortable.min.js
  4. 2
      bower.json
  5. 2
      component.json
  6. 2
      package.json

4
README.md

@ -536,11 +536,11 @@ Link to the active instance.
```html ```html
<!-- CDNJS :: Sortable (https://cdnjs.com/) --> <!-- CDNJS :: Sortable (https://cdnjs.com/) -->
<script src="//cdnjs.cloudflare.com/ajax/libs/Sortable/1.1.0/Sortable.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/Sortable/1.1.1/Sortable.min.js"></script>
<!-- jsDelivr :: Sortable (http://www.jsdelivr.com/) --> <!-- jsDelivr :: Sortable (http://www.jsdelivr.com/) -->
<script src="//cdn.jsdelivr.net/sortable/1.1.0/Sortable.min.js"></script> <script src="//cdn.jsdelivr.net/sortable/1.1.1/Sortable.min.js"></script>
<!-- jsDelivr :: Sortable :: Latest (http://www.jsdelivr.com/) --> <!-- jsDelivr :: Sortable :: Latest (http://www.jsdelivr.com/) -->

18
Sortable.js

@ -275,12 +275,12 @@
return; // only left button or enabled return; // only left button or enabled
} }
if (options.handle) {
target = _closest(target, options.handle, el);
}
target = _closest(target, options.draggable, el); target = _closest(target, options.draggable, el);
if (!target) {
return;
}
// get the index of the dragged element within its parent // get the index of the dragged element within its parent
oldIndex = _index(target); oldIndex = _index(target);
@ -308,6 +308,12 @@
} }
} }
if (options.handle && !_closest(originalTarget, options.handle, el)) {
return;
}
// Prepare `dragstart` // Prepare `dragstart`
if (target && !dragEl && (target.parentNode === el)) { if (target && !dragEl && (target.parentNode === el)) {
tapEvt = evt; tapEvt = evt;
@ -482,7 +488,7 @@
isOwner = (activeGroup === group), isOwner = (activeGroup === group),
canSort = options.sort; canSort = options.sort;
if (evt.dataTransfer && evt.dataTransfer.effectAllowed !== 'move') { if (!dragEl) {
return; return;
} }
@ -1028,7 +1034,7 @@
}; };
Sortable.version = '1.1.0'; Sortable.version = '1.1.1';
/** /**

4
Sortable.min.js vendored

File diff suppressed because one or more lines are too long

2
bower.json

@ -1,7 +1,7 @@
{ {
"name": "Sortable", "name": "Sortable",
"main": "Sortable.js", "main": "Sortable.js",
"version": "1.1.0", "version": "1.1.1",
"homepage": "http://rubaxa.github.io/Sortable/", "homepage": "http://rubaxa.github.io/Sortable/",
"authors": [ "authors": [
"RubaXa <ibnRubaXa@gmail.com>" "RubaXa <ibnRubaXa@gmail.com>"

2
component.json

@ -1,7 +1,7 @@
{ {
"name": "Sortable", "name": "Sortable",
"main": "Sortable.js", "main": "Sortable.js",
"version": "1.1.0", "version": "1.1.1",
"homepage": "http://rubaxa.github.io/Sortable/", "homepage": "http://rubaxa.github.io/Sortable/",
"repo": "RubaXa/Sortable", "repo": "RubaXa/Sortable",
"authors": [ "authors": [

2
package.json

@ -1,7 +1,7 @@
{ {
"name": "sortablejs", "name": "sortablejs",
"exportName": "Sortable", "exportName": "Sortable",
"version": "1.1.0", "version": "1.1.1",
"devDependencies": { "devDependencies": {
"grunt": "*", "grunt": "*",
"grunt-version": "*", "grunt-version": "*",

Loading…
Cancel
Save