Skip to content

Commit

Permalink
Merge pull request #443 from bahung1221/beta12
Browse files Browse the repository at this point in the history
Update to v1.0.0-beta.12
  • Loading branch information
tsov authored Nov 2, 2020
2 parents 5acbf88 + 9b8c4dc commit 8b4d0ec
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 32 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## v1.0.0-beta.12 - 2020-09-29

### Added

- Added `drag:stopped` event that will be fired after drag finished
- Support specifying an array of class name to Draggable `classes` option

### Changed

- Fixes incorrect `oldIndex` value when working with **nested sortable**
- Fixes wrong same container checking bug when working with **nested sortable**
- Fixes bug `drag:start` event was triggered during the delay time
- Fixes missing `overContainer` property in **DragOutEvent**

## v1.0.0-beta.11 - 2020-07-14

### Added
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@ or via CDN

```html
<!-- Entire bundle -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<!-- legacy bundle for older browsers (IE11) -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.legacy.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.legacy.js"></script>
<!-- Draggable only -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.js"></script>
<!-- Sortable only -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/sortable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/sortable.js"></script>
<!-- Droppable only -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/droppable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/droppable.js"></script>
<!-- Swappable only -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/swappable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/swappable.js"></script>
<!-- Plugins only -->
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/plugins.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/plugins.js"></script>
```

## Browser Compatibility
Expand Down Expand Up @@ -151,7 +151,7 @@ For more information, please checkout the [contributing document](https://github

## Roadmap

We are currently working on `v1.0.0-beta.11`. Check out the [project board](https://github.com/Shopify/draggable/projects/3) to see tasks and follow progress on the release. Any Pull Requests should be pointed against the feature branch `v1.0.0-beta.11`.
We are currently working on `v1.0.0-beta.12`. Check out the [project board](https://github.com/Shopify/draggable/projects/3) to see tasks and follow progress on the release. Any Pull Requests should be pointed against the feature branch `v1.0.0-beta.12`.

## Related resources

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopify/draggable",
"version": "1.0.0-beta.11",
"version": "1.0.0-beta.12",
"private": false,
"license": "MIT",
"description": "The JavaScript Drag & Drop library your grandparents warned you about.",
Expand Down
4 changes: 2 additions & 2 deletions src/Draggable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const draggable = new Draggable(document.querySelectorAll('ul'), {

- Browser (All Bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const draggable = new Draggable.Draggable(document.querySelectorAll('ul'), {
draggable: 'li'
Expand All @@ -25,7 +25,7 @@ const draggable = new Draggable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.js"></script>
<script>
const draggable = new Draggable.default(document.querySelectorAll('ul'), {
draggable: 'li'
Expand Down
4 changes: 2 additions & 2 deletions src/Droppable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const droppable = new Droppable(document.querySelectorAll('.container'), {

- Browser (All Bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const droppable = new Draggable.Droppable(document.querySelectorAll('.container'), {
draggable: '.item',
Expand All @@ -32,7 +32,7 @@ const droppable = new Droppable(document.querySelectorAll('.container'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/droppable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/droppable.js"></script>
<script>
const droppable = new Droppable.default(document.querySelectorAll('.container'), {
draggable: '.item',
Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/Collidable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const draggable = new Draggable(document.querySelectorAll("ul"), {

- Browser (All bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const draggable = new Draggable.Draggable(document.querySelectorAll('ul'), {
draggable: 'li',
Expand All @@ -35,8 +35,8 @@ const draggable = new Draggable(document.querySelectorAll("ul"), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/plugins/collidable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/plugins/collidable.js"></script>
<script>
const draggable = new Draggable.default(document.querySelectorAll('ul'), {
draggable: 'li',
Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/ResizeMirror/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const draggable = new Draggable(document.querySelectorAll('ul'), {

- Browser (All bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const draggable = new Draggable.Draggable(document.querySelectorAll('ul'), {
draggable: 'li',
Expand All @@ -39,8 +39,8 @@ const draggable = new Draggable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/plugins/resize-mirror.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/plugins/resize-mirror.js"></script>
<script>
const draggable = new Draggable.default(document.querySelectorAll('ul'), {
draggable: 'li',
Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/Snappable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const draggable = new Draggable(document.querySelectorAll('ul'), {

- Browser (All bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const draggable = new Draggable.Draggable(document.querySelectorAll('ul'), {
draggable: 'li',
Expand All @@ -34,8 +34,8 @@ const draggable = new Draggable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/plugins/snappable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/plugins/snappable.js"></script>
<script>
const draggable = new Draggable.default(document.querySelectorAll('ul'), {
draggable: 'li',
Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/SortAnimation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const sortable = new Sortable(document.querySelectorAll('ul'), {

- Browser (All plugins bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const sortable = new Draggable.Sortable(document.querySelectorAll('ul'), {
draggable: 'li',
Expand All @@ -46,8 +46,8 @@ const sortable = new Sortable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/sortable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/plugins/sort-animation.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/sortable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/plugins/sort-animation.js"></script>
<script>
const sortable = new Sortable.default(document.querySelectorAll('ul'), {
draggable: 'li',
Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/SwapAnimation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const sortable = new Sortable(document.querySelectorAll('ul'), {

- Browser (All plugins bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const sortable = new Draggable.Sortable(document.querySelectorAll('ul'), {
draggable: 'li',
Expand All @@ -45,8 +45,8 @@ const sortable = new Sortable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/sortable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/plugins/swap-animation.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/sortable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/plugins/swap-animation.js"></script>
<script>
const sortable = new Sortable.default(document.querySelectorAll('ul'), {
draggable: 'li',
Expand Down
4 changes: 2 additions & 2 deletions src/Sortable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const sortable = new Sortable(document.querySelectorAll('ul'), {

- Browser (All Bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const sortable = new Draggable.Sortable(document.querySelectorAll('ul'), {
draggable: 'li'
Expand All @@ -30,7 +30,7 @@ const sortable = new Sortable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/sortable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/sortable.js"></script>
<script>
const sortable = new Sortable.default(document.querySelectorAll('ul'), {
draggable: 'li'
Expand Down
4 changes: 2 additions & 2 deletions src/Swappable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const swappable = new Swappable(document.querySelectorAll('ul'), {

- Browser (All Bundle):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/draggable.bundle.js"></script>
<script>
const swappable = new Draggable.Swappable(document.querySelectorAll('ul'), {
draggable: 'li'
Expand All @@ -28,7 +28,7 @@ const swappable = new Swappable(document.querySelectorAll('ul'), {

- Browser (Standalone):
```html
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.11/lib/swappable.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@shopify/draggable@1.0.0-beta.12/lib/swappable.js"></script>
<script>
const swappable = new Swappable.default(document.querySelectorAll('ul'), {
draggable: 'li'
Expand Down

0 comments on commit 8b4d0ec

Please sign in to comment.