Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Commit 9b32531

Browse files
authored
Merge pull request #489 from angular-ui/v0.15.x-dev
Merge V0.15.x dev
2 parents 4bb4493 + 5c068f2 commit 9b32531

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

Diff for: README.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ This directive allows you to sort an array with drag & drop.
1010

1111
## Requirements
1212

13-
- JQuery
14-
- JQueryUI 1.9+
13+
- JQuery v3.1+ (for jQuery v1.x & v2.x use [v0.14.x versions](https://github.com/angular-ui/ui-sortable/tree/v0.14.x-stable))
14+
- JQueryUI v1.12+
1515
- AngularJS v1.2+
1616

1717
[Single minified cdn link](http://cdn.jsdelivr.net/g/jquery@1,[email protected]%28jquery.ui.core.min.js+jquery.ui.widget.min.js+jquery.ui.mouse.min.js+jquery.ui.sortable.min.js%29,[email protected],angular.ui-sortable) ~245kB and [example](http://codepen.io/thgreasi/pen/olDJi) with JQuery v1.x, required parts of JQueryUI v1.10, AngularJS v1.2 & latest angular-ui-sortable.
@@ -62,7 +62,7 @@ This is the preferred way since it:
6262
- reduces the chance of code duplication
6363
- [is suggested by the angularJS team](https://www.youtube.com/watch?feature=player_detailpage&v=ZhfUv0spHCY#t=3048)
6464
- it does not break the matching of the generated DOM elements and the `ng-model`'s items
65-
* `ui-sortable` lists containing many 'types' of items can be implemented by using dynamic template loading [with ng-include](http://stackoverflow.com/questions/14607879/angularjs-load-dynamic-template-html-within-directive/14621927#14621927) or a [loader directive](https://github.com/thgreasi/tg-dynamic-directive), to determine how each model item should be rendered. Also take a look at the [Tree with dynamic template](http://codepen.io/thgreasi/pen/uyHFC) example.
65+
* `ui-sortable` lists containing many 'types' of items can be implemented by using dynamic template loading [with ng-include](http://stackoverflow.com/questions/14607879/angularjs-load-dynamic-template-html-within-directive/14621927#14621927) or a [loader directive](https://github.com/thgreasi/tg-dynamic-directive), to determine how each model item should be rendered. Also take a look at the [Tree with dynamic template](http://codepen.io/thgreasi/pen/QKmWKj) example.
6666

6767
### Options
6868

@@ -158,7 +158,7 @@ update: function(event, ui) {
158158

159159
### jQueryUI Sortable Event order
160160

161-
**Single sortable** [demo](http://codepen.io/thgreasi/pen/KtsFH)
161+
**Single sortable** [demo](http://codepen.io/thgreasi/pen/QKmWGj)
162162
```
163163
start
164164
activate
@@ -171,7 +171,7 @@ deactivate
171171
stop
172172
```
173173

174-
**Connected sortables** [demo](http://codepen.io/thgreasi/pen/uIBKb)
174+
**Connected sortables** [demo](http://codepen.io/thgreasi/pen/YGazpJ)
175175

176176
```
177177
list A: start
@@ -201,24 +201,24 @@ For more details about the events check the [jQueryUI API documentation](http://
201201

202202
## Examples
203203

204-
- [Simple Demo](http://codepen.io/thgreasi/pen/jlkhr)
205-
- [Simple RequireJS Demo](http://codepen.io/thgreasi/pen/bNaxRq)
206-
- [Simple Touch-Enabled Demo](http://codepen.io/thgreasi/pen/rOevyv) using [jQuery UI Touch Punch](https://github.com/furf/jquery-ui-touch-punch/)
207-
- [Connected Lists](http://codepen.io/thgreasi/pen/uFile)
208-
- [Filtering](http://codepen.io/thgreasi/pen/mzGbq) ([details](https://github.com/angular-ui/ui-sortable/issues/113))
209-
- [Ordering 1](http://codepen.io/thgreasi/pen/iKEHd) & [Ordering 2](http://plnkr.co/edit/XPUzJjdvwE0QWQ6py6mQ?p=preview) ([details](https://github.com/angular-ui/ui-sortable/issues/70))
210-
- [Cloning](http://codepen.io/thgreasi/pen/qmvhG) ([details](https://github.com/angular-ui/ui-sortable/issues/139))
211-
- [Horizontal List](http://codepen.io/thgreasi/pen/wsfjD)
212-
- [Tree with dynamic template](http://codepen.io/thgreasi/pen/uyHFC)
204+
- [Simple Demo](http://codepen.io/thgreasi/pen/wzmvgw)
205+
- [Simple RequireJS Demo](http://codepen.io/thgreasi/pen/rrdNjj)
206+
- [Simple Touch-Enabled Demo](http://codepen.io/thgreasi/pen/wzmvJv) using [jQuery UI Touch Punch](https://github.com/furf/jquery-ui-touch-punch/)
207+
- [Connected Lists](http://codepen.io/thgreasi/pen/ozqNkr)
208+
- [Filtering](http://codepen.io/thgreasi/pen/XjEWRa) ([details](https://github.com/angular-ui/ui-sortable/issues/113))
209+
- [Ordering 1](http://codepen.io/thgreasi/pen/PGRomA) & [Ordering 2](http://plnkr.co/edit/gYsZZdFLeoeb5N9iemAO?p=preview) ([details](https://github.com/angular-ui/ui-sortable/issues/70))
210+
- [Cloning](http://codepen.io/thgreasi/pen/jrzOLA) ([details](https://github.com/angular-ui/ui-sortable/issues/139))
211+
- [Horizontal List](http://codepen.io/thgreasi/pen/zKWYdP)
212+
- [Tree with dynamic template](http://codepen.io/thgreasi/pen/VKXwzV)
213213
- Canceling
214-
- [Connected Lists With Max Size](http://codepen.io/thgreasi/pen/IdvFc)
215-
- [Connected Lists Without Duplicates](http://codepen.io/thgreasi/pen/NPaJyb)
216-
- [Promised Reverting](http://codepen.io/thgreasi/pen/MwQqdg)
217-
- [Locked Items](http://codepen.io/thgreasi/pen/GgdeEO)
218-
- [Draggable Handle](http://codepen.io/thgreasi/pen/ihAyr)
219-
- [Drop Zone](http://codepen.io/thgreasi/pen/LVXWeO)
220-
- [Draggable-Sortable like interaction](http://codepen.io/thgreasi/pen/LVVJgK)
221-
- [Static HTML Sorting](http://codepen.io/thgreasi/pen/qdmjwy)
214+
- [Connected Lists With Max Size](http://codepen.io/thgreasi/pen/zKWYEP)
215+
- [Connected Lists Without Duplicates](http://codepen.io/thgreasi/pen/PGRoJr)
216+
- [Promised Reverting](http://codepen.io/thgreasi/pen/ORvJzJ)
217+
- [Locked Items](http://codepen.io/thgreasi/pen/ALyBVQ)
218+
- [Draggable Handle](http://codepen.io/thgreasi/pen/PGRoRY)
219+
- [Drop Zone](http://codepen.io/thgreasi/pen/zKWYWR)
220+
- [Draggable-Sortable like interaction](http://codepen.io/thgreasi/pen/mAxdxk)
221+
- [Static HTML Sorting](http://codepen.io/thgreasi/pen/XjEWqV)
222222

223223
## Integrations
224224
- [firebase](http://codepen.io/thgreasi/pen/repEZg?editors=0010)

Diff for: bower.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-ui-sortable",
3-
"version": "0.14.3",
3+
"version": "0.15.0",
44
"description": "This directive allows you to jQueryUI Sortable.",
55
"author": "https://github.com/angular-ui/ui-sortable/graphs/contributors",
66
"license": "MIT",
@@ -17,8 +17,8 @@
1717
],
1818
"dependencies": {
1919
"angular": ">=1.2.x",
20-
"jquery": "<3.0.0",
21-
"jquery-ui": ">=1.9"
20+
"jquery": ">=3.1.x",
21+
"jquery-ui": ">=1.12.x"
2222
},
2323
"devDependencies": {
2424
"angular-mocks": ">=1.2.x",

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-ui-sortable",
3-
"version": "0.14.3",
3+
"version": "0.15.0",
44
"description": "This directive allows you to jQueryUI Sortable.",
55
"author": "https://github.com/angular-ui/ui-sortable/graphs/contributors",
66
"license": "MIT",

0 commit comments

Comments
 (0)