Skip to content

Bringing up to date with the head fork #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 454 commits into from
Oct 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
454 commits
Select commit Hold shift + click to select a range
9ce1e52
fix(nested.spec): minor tweak for chrome37
thgreasi Jul 27, 2014
19dfc6c
Merge pull request #236 from thgreasi/master
thgreasi Jul 27, 2014
c6709fa
fix(sortable): clear savedNodes to fix a leak for items that get removed
thgreasi Aug 12, 2014
a02888e
Merge pull request #244 from thgreasi/clearSavedNodes
thgreasi Aug 12, 2014
b3c2d53
chore: increase version number to v0.12.9
thgreasi Aug 12, 2014
cca089f
Merge pull request #245 from thgreasi/master
thgreasi Aug 12, 2014
3096ae8
chore: increase version number to v0.12.10
thgreasi Aug 12, 2014
4f1942d
Merge pull request #246 from thgreasi/master
thgreasi Aug 12, 2014
342108a
docs(README): add minified dependencies cdn link
thgreasi Aug 23, 2014
d21f532
docs(README): fix combined cdn file aproximate size
thgreasi Aug 23, 2014
255128f
Use svg instead of png to get better image quality
PeterDaveHello Aug 26, 2014
76ab26b
Merge pull request #253 from PeterDaveHello/patch-2
thgreasi Aug 26, 2014
5168154
docs(README): add "prevent duplicates" example
thgreasi Aug 27, 2014
d5365e7
fix(sortable): manage appendTo option
d33d33 Sep 6, 2014
34ed7bf
Merge pull request #263 from Intia/appendTo
thgreasi Sep 7, 2014
2ce617f
tests(sortable): add one more sorting to 'appendTo' test case
thgreasi Sep 7, 2014
28b82f9
chore: increase version number to v0.12.11
thgreasi Sep 7, 2014
57c5332
Merge pull request #264 from thgreasi/master
thgreasi Sep 7, 2014
2fb4240
feat(sortable): update local variable with active options
thgreasi Jul 8, 2014
104405b
feat(sortable): add workaround for horizontal lists
thgreasi Jul 8, 2014
830831c
test(sortable): add tests for horizontal lists workaround
thgreasi Jul 8, 2014
2e22b0e
docs(README): add section about floating workaround & example
thgreasi Jul 8, 2014
1d18029
fix(sortable): clear ui.item.sortable properties after drag stop
thgreasi Aug 31, 2014
14ae8da
test(sortable): add tests for ui.item.sortable proper destruction
thgreasi Aug 31, 2014
d777fef
refactor(sortable): replace for-in-hasOwnProperty with angular.forEach
thgreasi Sep 3, 2014
ff25513
feat(sortable): add extra properties to ui.item.sortable
thgreasi Sep 3, 2014
3a845c5
tests(sortable): add tests for the properties of ui.item.sortable
thgreasi Sep 4, 2014
54de466
Merge pull request #261 from thgreasi/extraProperties
thgreasi Sep 7, 2014
381ed62
tests: fix configuration of custom helper function + cancel() test
thgreasi Sep 7, 2014
06b506e
Merge pull request #262 from thgreasi/helperFuncTestFix
thgreasi Sep 7, 2014
debc5be
demo: apply responsive design to demo page
walkingice Jul 20, 2014
ca52269
demo: add case of connected list
walkingice Jul 20, 2014
1da4f7e
docs(README): change dynamic nested tree helper repo link
thgreasi Sep 18, 2014
28c545e
Merge pull request #272 from thgreasi/readmeDynamicDirective
thgreasi Sep 18, 2014
837f1a6
docs(API.md): add API.md explaining ui.item.sortable properties
thgreasi Oct 5, 2014
6fc6ffa
Merge pull request #276 from thgreasi/extraPropertiesDoc
thgreasi Oct 5, 2014
fb52727
chore: update bower.json to allow angular#1.3
thgreasi Oct 14, 2014
2a5f7c3
chore: increase version number to v0.13.0
thgreasi Oct 14, 2014
c819182
Merge pull request #279 from thgreasi/v0.13.x-dev
thgreasi Oct 14, 2014
37c11b9
Merge pull request #280 from angular-ui/v0.13.x-dev
thgreasi Oct 14, 2014
0316932
Perf Improvement: don't digest after the $timeout.
BrianGenisio Nov 7, 2014
aedb58f
Merge pull request #292 from BrianGenisio/master
thgreasi Nov 8, 2014
05f057f
refactor(sortable): correctly pull attribute when using data attributes
fishfacemcgee Nov 10, 2014
bef515e
chore(sortable): clean up whitespace
fishfacemcgee Nov 10, 2014
e20710b
Merge pull request #295 from fishfacemcgee/clean-attrs
thgreasi Nov 11, 2014
0ce0a05
test(sortable): test sorting from between different scopes
thgreasi Nov 15, 2014
f4a320d
test(sortable): add test for connected sortables that use data-ng-model
thgreasi Nov 15, 2014
7824aab
Merge pull request #300 from thgreasi/differentScopeTest
thgreasi Nov 15, 2014
60b1724
Merge pull request #301 from thgreasi/testForPR295
thgreasi Nov 15, 2014
92a5c0f
test(sortable): test droptargetModel when sorting between different s…
thgreasi Nov 15, 2014
d33d7c9
refactor(sortable.e2e.multi.spec): proper clean-up DOM elements
thgreasi Nov 15, 2014
9235467
Merge pull request #302 from thgreasi/testForPR295CrossScope
thgreasi Nov 15, 2014
ac4455f
Merge branch 'master' of https://github.com/walkingice/ui-sortable in…
thgreasi Nov 15, 2014
bbbf0e1
fix(demo): disable sorting between examples
thgreasi Nov 15, 2014
ff53938
Merge pull request #303 from thgreasi/walkingice-master
thgreasi Nov 15, 2014
0aa32d4
chore: increase version number to v0.13.1
thgreasi Nov 15, 2014
fcec4c0
Merge pull request #304 from thgreasi/master
thgreasi Nov 15, 2014
69d164d
added handle example to readme
gregtzar Nov 18, 2014
a257a20
Merge pull request #305 from gtczap/master
thgreasi Nov 18, 2014
36a14c3
feat(sortable): add scope isolation
thgreasi Jan 3, 2015
11a3fd2
Merge pull request #311 from thgreasi/scoped
thgreasi Jan 8, 2015
7c75125
test: add data-* anotation tests
thgreasi Jan 10, 2015
6db6808
fix(sortable): fix 'data-ui-sortable' directive annotation error
thgreasi Jan 10, 2015
a723311
Merge pull request #315 from thgreasi/dataAnotationRefresh
thgreasi Jan 10, 2015
699243d
fix(sortable): restore support for jquery 1.10
thgreasi Jan 16, 2015
4ccc37a
Merge pull request #319 from thgreasi/master
thgreasi Jan 16, 2015
6cde1a2
chore: increase version number to v0.13.2
thgreasi Jan 16, 2015
7d8b77e
Merge pull request #320 from thgreasi/master
thgreasi Jan 16, 2015
1532421
test: disable debugInfo on all tests
thgreasi Jan 8, 2015
9520c98
test: rewrite tests to work whith disabled debugInfo
thgreasi Jan 10, 2015
3dcefe9
test: add data-ng-repeat test
thgreasi Jan 11, 2015
c023e32
feat(sortable): add support for the case that debugInfo is disabled
thgreasi Jan 8, 2015
9ef4622
refactor(sortable): change getElementScope to increase code coverage
thgreasi Jan 15, 2015
b6734fe
refactor(sortable): use the shorthand isolated scope property definition
thgreasi Jan 17, 2015
cf82c0b
Merge pull request #314 from thgreasi/debugInfoEnabled
thgreasi Jan 20, 2015
ce64adf
chore: increase version number to v0.13.3
thgreasi Jan 20, 2015
b5fb6fd
Merge pull request #322 from thgreasi/master
thgreasi Jan 20, 2015
e0eb74d
test(sortable): add test for `this` inside the option callbacks
thgreasi Jan 21, 2015
3a8dff1
fix(sortable): propagare the context to the combined/wrapped callbacks
thgreasi Jan 21, 2015
7e82930
Merge pull request #323 from thgreasi/callbackContext
thgreasi Jan 22, 2015
0174980
docs(README): add debugInfo Disabled Ready badge
thgreasi Jan 25, 2015
8b343f1
docs(README): change to the svg coveralls badge
thgreasi Jan 25, 2015
acc8ef9
docs(README): add accordion integration example
thgreasi Feb 1, 2015
941dfb0
docs(README): add drop zone example
thgreasi Feb 2, 2015
0ef26b6
docs(README): update examples to use v0.13.x properties
thgreasi Feb 4, 2015
282613c
using $watchCollection instead of $watch
micah-williamson Feb 9, 2015
43e9a3c
Merge pull request #333 from iamchairs/watch-collection
thgreasi Feb 9, 2015
2592b4a
test: rename appendTo tests to be more descriptive
thgreasi Feb 10, 2015
ead6cc1
test(sortable): add test for appendTo when using a jQuery object
thgreasi Feb 10, 2015
c2b73e0
docs(README): raise minimum angular version to 1.2 and add polyfill n…
thgreasi Feb 10, 2015
56dd84c
docs(README): add Simple RequireJS example
thgreasi Feb 11, 2015
1c7c406
docs(README): add locked items example
thgreasi Feb 25, 2015
eed43fb
docs(CONTRIBUTING): add jquery-ui-sortable example
thgreasi Mar 5, 2015
a258424
docs(ui-floating): add notice about the resolved jquery-ui issue
thgreasi Mar 12, 2015
704cc55
fix(sortable): use $watchCollection to track ngModel changes
thgreasi Mar 26, 2015
8ec7b03
feat(sortable): allow extra element before/after ng-repeat
tomyam1 Mar 26, 2015
08fa332
docs(README): add min required and older version notes
thgreasi Apr 3, 2015
58c6c7b
test(sortable): use li elements instead of div elements for testing e…
tomyam1 Apr 4, 2015
a20ee2f
fix(sortable): properly remove the sorting helper when a drag is reve…
thgreasi Apr 5, 2015
758a1e2
refactor(sortable): abstract placeholder & helper element retrieval
thgreasi Apr 5, 2015
b03735d
test(sortable): make all tests run with&without extra elements
thgreasi Apr 6, 2015
7d9a831
docs(README): add notice for extra elements support & limitations
thgreasi Apr 12, 2015
36badd1
Merge branch 'tepez-extra_elems-rebase' into v0.14.x-dev
thgreasi Apr 14, 2015
381623a
docs(README): add Draggable-Sortable like interaction example
thgreasi May 4, 2015
829ee3f
docs(API): add note about the lifecycle of ui.item.sortable properties
thgreasi May 4, 2015
5b525e8
docs(README): add note about applying filters
thgreasi May 10, 2015
6aaad4c
chore(dist): add version & license banner to dist files
thgreasi Jun 7, 2015
3ae0fb6
Merge pull request #367 from thgreasi/add-banner
thgreasi Jun 7, 2015
d5a5535
chore: add .npmignore to include dist files to npm publish
thgreasi Jun 7, 2015
b81158d
chore: increase version number to v0.13.4
thgreasi Jun 7, 2015
4838660
Merge pull request #368 from thgreasi/master
thgreasi Jun 7, 2015
f0e58b3
docs(README): add static HTML sorting example
thgreasi Jun 7, 2015
4023aba
docs(README): group static HTML sorting example
thgreasi Jun 7, 2015
3b3fe0e
docs(README): add installation instructions
thgreasi Jun 27, 2015
ed7b69f
chore(gruntFile): add `test` Task and make `default` a synonym of it
thgreasi Jun 27, 2015
97c8ad3
feat(sortable): restore deleted options to default value
thgreasi Jun 27, 2015
2905b5d
test(sortable): test that deleted options are restored to their defau…
thgreasi Jun 28, 2015
61c50b4
Merge pull request #373 from thgreasi/DeletedOptionsAndRefactor
thgreasi Jun 28, 2015
f2bf47b
Update README.md
kenning Jul 2, 2015
e40d894
docs(README): add Promised Reverting example
thgreasi Jul 3, 2015
f92aecd
Merge pull request #374 from kenning/patch-1
thgreasi Jul 3, 2015
18dacfa
docs(README): add link to angular-ui-sortable-loader
thgreasi Jul 4, 2015
9df5b53
docs(README): add note about callbacks and $apply
thgreasi Jul 4, 2015
63ba715
docs(README): add gitter badge
thgreasi Jul 11, 2015
c5cdd4c
docs(README): update travis badge to target master branch
thgreasi Jul 11, 2015
226aacd
docs(README): update dropzone example
thgreasi Jul 28, 2015
ffe55cb
docs(README): add notice for ng2 branch
thgreasi Aug 2, 2015
a462388
docs(README): add touch enabled demo page
thgreasi Sep 18, 2015
d4d1558
now, ui sortable only starts if the disabled option is not set. once …
Mar 11, 2016
6991b9f
moved starting code into a new function, and cancelling watcher if st…
Mar 11, 2016
ec6567f
memory efficiency with angular.noop
Mar 11, 2016
00f5263
chore: upgrade karma PhantomJS and Jasmine
thgreasi Mar 12, 2016
ec103c9
chore: use Chrome and Firefox on Travis, since PhantomJS was inconsis…
thgreasi Mar 13, 2016
5d540af
chore: stop using PhantomJS for tests
thgreasi Mar 13, 2016
d8fa639
Merge branch 'waitForNotDisabled0.14' of https://github.com/michaschw…
thgreasi Mar 13, 2016
99306dd
fix(sortable): fix tests failing with lazyInit
thgreasi Mar 18, 2016
cf47253
refactor(sortable): refactor lazy init code
thgreasi Mar 18, 2016
cbd3efd
test(sortable): add lazy init tests
thgreasi Mar 18, 2016
428afa9
Merge pull request #444 from thgreasi/michaschwab-waitForNotDisabled0.14
thgreasi Mar 18, 2016
93dde15
chore(jshintrc): add fit to allowd methods
thgreasi Mar 22, 2016
a103b25
test(sortable): add lazy init tests using $timeout
thgreasi Mar 22, 2016
15de356
fix(sortable): fix lazy init code to cover $timeout tests
thgreasi Mar 22, 2016
e591eea
refactor(sortable): make getPlaceholderExcludesludes more generic
thgreasi Mar 21, 2016
560be12
fix(sortable): remove reduntant element re-appendTo()
thgreasi Mar 25, 2016
8f18eda
test(directiveOptions): fix typos, correcting tests
thgreasi Mar 21, 2016
c0ca9ce
feat(sortable): add ui-model-item option, sets the model generated items
thgreasi Mar 18, 2016
8285a57
test(directiveOptions): add test for the ui-model-item option
thgreasi Mar 22, 2016
3aa9450
style(sortable): reindent long lines and fix object property spacing
thgreasi Mar 25, 2016
728c724
Merge pull request #445 from thgreasi/uiModelItems
thgreasi Mar 27, 2016
e3e0548
Merge branch 'master' into v0.14.x-dev
thgreasi Mar 28, 2016
2d43748
Merge branch 'v0.14.x-dev'
thgreasi Mar 28, 2016
fd27899
chore: increase version number to v0.14.0
thgreasi Mar 28, 2016
4f18c64
docs(README): add firebase example
thgreasi Apr 9, 2016
9e935bf
docs(README): fix broken jquery-ui floating issue link
mooyoul May 6, 2016
85c0453
Merge pull request #454 from mooyoul/master
thgreasi May 7, 2016
fc21c4f
Typo on README.md
nighto May 25, 2016
f5b9ce5
Merge pull request #459 from nighto/patch-1
thgreasi May 25, 2016
ed85847
test(e2e.callbacks): access sortable object inside helper
thgreasi May 27, 2016
74a1fe4
feat(sortable): access sortable object inside helper
thgreasi May 27, 2016
e7a1263
chore: increase version number to v0.14.1
thgreasi May 27, 2016
127cf26
Merge pull request #461 from angular-ui/sortableObjectOnHelper
thgreasi Jun 4, 2016
5eea81d
docs(README): add npm version badge
thgreasi Jun 6, 2016
ff21d19
chore: increase version number to v0.14.2
thgreasi Jun 6, 2016
723a2a5
docs(README): add actual npm version badge
thgreasi Jun 6, 2016
073cbcf
docs(README): improve cross-list canceling notes
thgreasi Jun 30, 2016
e56713a
chore(bower.json): limit jquery version to pre v3
thgreasi Jun 30, 2016
b162b3d
Merge pull request #467 from angular-ui/avoid-jquery-3
thgreasi Jun 30, 2016
151f27d
chore(package.json): increase version number to v0.14.3
thgreasi Jun 30, 2016
2988412
chore(bower.json): increase version number to v0.14.3
thgreasi Jun 30, 2016
1650ef6
remove unused
wuliupo Jul 19, 2016
4bb4493
Merge pull request #476 from wuliupo/patch-1
thgreasi Jul 19, 2016
6b2d806
chore: increase min jQuery & jQuery-UI versions
thgreasi Oct 8, 2016
96c0798
docs(README): add notice about older jQuery versions
thgreasi Oct 8, 2016
91fab52
chore: increase version number to v0.15.0
thgreasi Oct 8, 2016
5c068f2
docs(README): update libs used in pens
thgreasi Oct 8, 2016
9b32531
Merge pull request #489 from angular-ui/v0.15.x-dev
thgreasi Oct 15, 2016
da521c0
docs(README): add multi-select example
thgreasi Nov 14, 2016
b26aa64
test(callbacks): test cancel() when helper is used
thgreasi Nov 28, 2016
49b4f9e
test(callbacks): try canceled sortings more that once
thgreasi Nov 28, 2016
6cd1c07
fix(sortable): properly restore DOM after cancel()
thgreasi Nov 28, 2016
53a31b3
chore: increase version number to v0.15.1
thgreasi Nov 28, 2016
57c5021
Merge pull request #493 from thgreasi/helperCancelX3
thgreasi Nov 28, 2016
eae805d
Fixed to work with deep descendants
yenoh2 Nov 29, 2016
37d04d3
Correcting linter errors
yenoh2 Nov 30, 2016
3c36ecd
test(directives): add transclusion tests
thgreasi Nov 30, 2016
c3232eb
feat(sortable): improve the source and droptarget detection
thgreasi Nov 30, 2016
fd8238f
refactor: change getElementScope to retireve the whole context
thgreasi Dec 1, 2016
6ce8a9c
feat(sortable): expose item container in ui.item.sortable
thgreasi Dec 2, 2016
4fd4207
refactor(sortable): add _getElementContext() on ui.item.sortable
thgreasi Dec 2, 2016
19c968d
feat(sortable): add support for transcluded descendants
thgreasi Dec 2, 2016
bec8e9d
test(directives): add transclusion tests w/ connected sortables
thgreasi Dec 4, 2016
84fa8b2
docs(README): add docs for helper callback
thgreasi Dec 4, 2016
343f01d
docs(README): add docs about transcluded sorting
thgreasi Dec 4, 2016
c43e249
chore: increase version number to v0.16.0
thgreasi Dec 4, 2016
7c3254c
chore(travis): use latest firefox release
thgreasi Dec 4, 2016
90d2672
Merge pull request #496 from angular-ui/v0.16.0-dev
thgreasi Dec 4, 2016
2a409d5
introducing a $emit when a transaction finish
mapmf Dec 6, 2016
1be1ed0
notify parent when was moved (performance refactor)
mapmf Dec 8, 2016
c387ba5
notify parent when was moved (performance refactor) fix
mapmf Dec 8, 2016
ccc6006
test: add test for data-ui-sortable declaration
thgreasi Dec 16, 2016
2af95e5
fix(sortable): restore support for data-ui-sortable declaration
thgreasi Dec 16, 2016
e4112a6
chore: increase version number to v0.16.1
thgreasi Dec 16, 2016
6cfe4e1
Merge pull request #501 from thgreasi/fix1.6AlternativeDirectiveDecla…
thgreasi Dec 16, 2016
f275977
Html attribute based event handling
BurakAkyildiz Jan 5, 2017
6efeec2
Attribute callbacks capsulated
BurakAkyildiz Jan 6, 2017
d27f190
Space warning fix for travis-ci
BurakAkyildiz Jan 6, 2017
ec1b5f7
Travis-ci fix again
BurakAkyildiz Jan 6, 2017
fe2af1f
Travis-ci fix again -_-
BurakAkyildiz Jan 6, 2017
415d983
Travis-ci - There is no fail
BurakAkyildiz Jan 6, 2017
b6d8bda
Travis ci
BurakAkyildiz Jan 6, 2017
ef5862c
feat(sortable): change attr callback implementation w/ meta-programming
thgreasi Mar 6, 2017
b506cb0
test: add feat(sortable): attr callback implementation tests
thgreasi Mar 6, 2017
7ebaa33
docs(README): improve docs for attr callbacks
thgreasi Mar 6, 2017
70653ab
Merge branch 'master' of https://github.com/mapmf/ui-sortable into ma…
thgreasi Mar 6, 2017
aab1710
fix(README): fix attribute handler code sample
thgreasi Mar 7, 2017
689b200
feat: end up with the initial complete event $emit implementation
thgreasi Mar 7, 2017
8c01bc2
test(events): add tests about event `$emit`tion
thgreasi Mar 7, 2017
220125b
docs(API): add docs about the `$emit`ted event
thgreasi Mar 7, 2017
f49794a
Merge pull request #506 from angular-ui/README-fix-attr-handler
thgreasi Mar 7, 2017
9e1598f
docs(README): add attribure handlers demo
thgreasi Mar 8, 2017
18cc295
chore: increase version to 0.17.0
thgreasi Mar 8, 2017
496fb42
fix(sortable): fix incorrect helper returned from getSortingHelper().
joujiahe Apr 14, 2017
6f56042
fix(sortable): fix lint error
thgreasi Apr 15, 2017
a8d6002
test(e2e.callbacks.spec): add test for cloned helper appended to body
thgreasi Apr 15, 2017
a9d796f
chore: increase version to 0.17.1
thgreasi Apr 15, 2017
cfcb636
Merge pull request #515 from thgreasi/joujiahe-master
thgreasi Apr 15, 2017
2ff4a1a
Fix in Material example title.
i62navpm Jul 25, 2017
72928dd
Merge pull request #529 from i62navpm/patch-1
thgreasi Jul 25, 2017
6d31d46
fix(README): fix duplicate event
Jul 25, 2017
b6a8223
Merge pull request #530 from tsujiura/develop
thgreasi Jul 26, 2017
204825a
docs(README): update for jQuery-UI v1.12
thgreasi Aug 5, 2017
5a860d1
chore: add npm scripts
thgreasi Aug 17, 2017
3e19a57
chore(travis): update to node 6
thgreasi Aug 17, 2017
6a92dfe
chore(travis): limit firefox to v54
thgreasi Aug 17, 2017
09c0112
test(e2e.nested): test directly nested sortables
thgreasi Aug 17, 2017
9bb11af
fix(sortable): fix droptarget detection on directly nested sortables
thgreasi Aug 17, 2017
e5c1098
Merge pull request #535 from thgreasi/fix-directly-nested-sortables
thgreasi Aug 17, 2017
17c4158
chore: increase version to 0.17.2
thgreasi Aug 17, 2017
d151ca3
added `ui-preserve-size` option
dashawk Oct 16, 2017
c062ff5
Add ui-preserve-size option
thgreasi Nov 25, 2017
c66dd94
Merge pull request #543 from thgreasi/ui-preserve-size
thgreasi Nov 26, 2017
227d018
chore: increase version to 0.18.0
thgreasi Nov 26, 2017
1900f97
chore: add prettier & husky
thgreasi Nov 26, 2017
248ff43
chore: prettify sources
thgreasi Nov 26, 2017
0c88d07
Add run-time dependencies
robertbradleyux Jan 10, 2018
22ba7f3
Update package.json
robertbradleyux Jan 10, 2018
e3d158b
Merge pull request #547 from robertbradleyux/patch-1
thgreasi Jan 12, 2018
1de674e
chore: increase version to v1.19.0
thgreasi Jan 14, 2018
89f964e
Updated small typo in the readme
May 16, 2018
e763b57
Merge pull request #549 from MaxArendsen/patch-1
thgreasi May 16, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
bower_components/
node_modules/
node_modules/
coverage/
junit/
dist/
out/
24 changes: 24 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"boss": true,
"browser": true,
"curly": true,
"eqnull": true,
"expr": true,
"immed": true,
"indent": 2,
"laxbreak": true,
"loopfunc": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
"quotmark": true,
"smarttabs": true,
"sub": true,
"trailing": true,
"undef": true,
"unused": true,
"globals": {
"angular": false
}
}
6 changes: 6 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
bower_components/
node_modules/
coverage/
junit/
# dist/
out/
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"single-quote": true
}
48 changes: 39 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,42 @@
language: node_js
node_js:
- "0.8"

- '6'
addons:
firefox: "54.0.1"
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -g bower grunt-cli
- npm install
- bower install

script: "grunt"
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -qg bower grunt grunt-cli
- npm install -q
- bower install
after_success:
- ./node_modules/angular-ui-publisher/travis/authentication.sh || exit 0
- grunt dist build:gh-pages publish:gh-pages build:bower publish:bower
script: grunt
env:
global:
- REPO="[email protected]:angular-ui/ui-sortable.git"
- secure: lv6/NYEdeaQi/ITVGbmWLdj2LoHjrMaF511YoDOOEWjdtCZPUmIciMYDvDidaLzr5NKgtaQCzGouHIgbdM2r+blJndTB+fydXYw3nq9qvRsXRGbWH0TY2KtdB++73NhomHN2kOYAx7IOW7XN+StWG6kdBFJ6lDOZl9vOZTHnHvE=
- secure: A6zLTHw99hvJ37FNKPnW4y6Eu/G+1M7NEw4vgWDlyH96RB0QYYvRKuHVn68FRBtHSdcaFzuANjzxeE0QEBBhq4kM4AjsQtveBHJcTBDZGnzZB7krH1E8yrNH70EWI8b3bXsWzUaYeNgUMFJpFa1pEMWq2rCe0CwEFVHf8TlF7MI=
- secure: BEWMRv9ET7fXabDkAvRQJBsIziyDeYrVkXDEINgdDwaoNclYtDSnxyYMG1wAcoNM6Znb8MdcmZm2SaOUOxIwplukomh1i8oT6wXeEl+vaYoCS6kz9iwcqgE0rFx9Zo+9q+UCvst30aB//XtVt71tbpKYaNTilZH2U6gvmUxYUAM=
- secure: SbIj+dXPq3y+cREpT+GoXBflKr2SmonL+ini3Q+7EL+82xMbqnTYRRdVvSBOAbK35fskBgDec91kuF2jKKvi3n2kYLWqYC5a6MteMsD/Ne7ntmebSZ4xIoI2CnHnYMoh8X5r2R5ykAu9phKDb6ujNol2bSI/2UBeSXse1ROp6M8=
- secure: RCFXr57oVjSOnM28rYMSfi4xlU70R5bjbDU+NUhQ+Mw7S1Bz1B0F+ZwMRuXDz2GnBnA+2Vu6i6qY0TWxfd7SAkG7+mW8hKc7OrHjYSt6tPPeCfwx6fcnFF6wxWR5fOt47aX4sNnOkaAoPQa2rf6uPHknTP0mVJgX//hsS++8orw=
- secure: VPb2CQUyWC0BY5Pf2qJpUBEV3nPvvxeQYMZ/woVy53TN+EL0n0un70Ia9ddGBljcRLYht08lRnf8SMnSkpCyqtDGVY/XskzdR7D2JJk0DoBoShPHeVPz6wb+Za1F/syp1S+P4L+9+ZTrDFwkXoTN6ZEVoOqh8S5SW5lyxpBcOjo=
- secure: fGkAkjv8+0UEpmVDK2tDsJ2b7pAazNkZnBtIB+dLNDxeIPp/o75TiIN52dsjYMS4v8AhPX9XEGgURHKO4Tt3CJ42oAV3SXFSSKZ+HUad0YzEw0SCLsMJOJvGSyg8A9d811//KpDZkSvNTLRER9kW+ONVGWkaqDzZk9JNAiZQ21E=
- secure: moG6EmijG8fnkSEKWT5939qubV7bupNHiR1f61HAaC4dFN2fnQuqzamBlRTmdISOuhFKkMAZRt9ZpRjeOTwcGzE+PV2WkbLzZggn19uPV/4J6cm3MBDhnbJfrTnNCD+XoxfgJezwWL+yA+OTKOjKoli/c2j3gA18lHxL8RGGfWA=
- secure: ey2lvN+BsXGwYm8uMuVl22fv6ABqdqr+wEGsXVq0IwMfoyifXu7Zjbqq3dbxwOADlm2BpuBM1EMOh4b3J5Xae5KbkZ1olh8wbTT07XN6GdRyKoxRgkxORyjQe35uPpxNXPG/4MDPGvOer4tP205GSSET7GzXgTjeoUP/Wn04l3U=
- secure: BkaTcpkvyph2ktmqHmWV2sM+3U2X/Np7LH6CjV/up1tyUqLUVOg7KcxVnDhrfrzxeQQqDv8CX4bkE9OIe0PrIU5FzRDAlxmEA1n8iR/ZFQdLmdLXIT5Aq58oEggyB3GvmojOLSB2MT2jPucz+RpftaglaUtxwa20nxryigEDOdU=
- secure: TQqMgKNva40V429OmdCpFHiAXc86wIhnSN4MYSKpWKb4vmG7pL75ycjYCxADpKJjOjGb4JYk/UZOk/3PIWi2g0j/thNEIK48jak7dtA7I9RZ/pKA6JN4LxaSlcsrOUhFfWAzfchrqpbHCwvzKlbFJmulRXKAeFbqXmzf6IaUVZg=
- secure: CbGh34phZ9Fbzow1JmtDcbbfu5si7piJLUFFAxGlXlu7lYVp5XpgCJ40uIpbzArZ8ZYaD9ZtoCqBgW5dDKRMUdbyobIqbeIcnljAXrHR+M6FonLuao+TLOe9s2k1fThU4Pdxm9aGedz63UwaTdibCY+mFK7jNptxkfO4RAsnsuw=
- secure: i41+wqwnBiQ+OICjPcOFFTkkznqS6E3sVay9plI7RSQJjN4hj9Nvmarr6l9dqIUUSuIrkZVfynvpOezPT6mrOJZulpGOamJMBfueJ03Vk2pT8vtRRMh1ICyNSz6ZznORa7tZYOM+oI8Bi9gXJzVfxWvTF958XyVgX6GeYEWYCME=
- secure: gH09SKPIpoUCci3DGJ6jQYIOCtGuU12pUyMNJbws+/AKKgLTfozPqbsYZ/CWZOC5Wh/dvTiW0tRsZDYRfq1MWosoDjd1QxlzlhvqxQ120F1LtLHm9IPgrVdHBzG1dJdKUIkgYL+4pwgMbPJUWDfJduxd4iI1eZzqYEWR+lapjEE=
- secure: LHeYrBZ1mfPRi4xEv1pc+HlQGtUtsRFUHLMel7UafILSfjhqRu0p0uH0RvqjB4ctrjufqrpZh+C5iAitKULoX7drRZABxR4fUAGUT7UADJ3YAFuhseNNpNPa5LOqhcsxA4t+oFsnZq+/1HvGAXi/tkrIJlogiNdIO5/EcwI2GOc=
- secure: dq9Bjf+44cEeOqdVT8za+3uCGXcjAZ1DdkSZ1bp7qlEcFsV4xjgwa1Qa4XWl9D5x1ZjuQ/CG2Hbcm1N+CW9UtmJsxqmQye+WkwD14HzKoRTQubMW2woiTuPWj2HcZB03S24f9r83kxCyvdhBeNcNgqPYZByQerlWhd8mKzKvLq8=
- secure: bMOOsktaSAshyBJQMlLZMBVoHguYJRFM0FUkskhIi9OTXsJajBAw5TYqsSlEJcMb65tgWR0KzHYOVKesoZvq5pyWkIANIJduoGwAuhY6loMmhY+kBF4ZKx6d+V1pnyzT5uW/0Jn+nN6XiuXHGx/fjppAvi/AYd05+bRYvAvYoRQ=
- secure: Nit2R7+Ob/jDz0i/3iUrcMjskkwlr/Bp+xWYm9MS/9LSG19N+eV/1McNEe1joFUeQ29IfZUU522u27Twbf9h10X/4um99vSwxUkqyTpR5Gl8N7bu51bbRzGwTFqAQoxiIc2bEpSwVyql0okLnYsaZVDOjlyuAqZ1RRj+xBfcUrI=
- secure: ZoIMbOS9tUpCEZyWGEzkNITPvPorJ+d7n3yMGJqhD6Ud7n6oFyLskT7JECZ4cUiykVaWsAHGMN+xxYLUkAJLdhd2gE3reN+8JrSjJb32W0Sf+5z1ajcwWBsZu4nyxRpPo2QZduS7lU2M0+YdFs8qG7gEhploFDu7hZOI2RaCkTo=
- secure: DZhkAksHSU8MGN0dISwGWA2uuMEvxpeSmqJu2fpPTei//n5l/n+RqlfYH8hUKdMf87RBpXRY1VpHiFYpkNYsmf903gw3kdRWhW07hG3Yt9hXc+YIR0OK6KZ5sb/XZi/ZkWrPEInAL2Yol00e6+U13134SZlPE84P6ktXiKKtlMc=
- secure: Cy34UQZ7/9toUKV6905XYeXIaFdDRhLb+ibEbLnjoo3ifeApNaecc1l4aBN88HN6nKnX1TKSZyiETwCpCWCee2d7KTi4IhSFTAa+SVUTV6BmikhdUs6MwemyreyWFlxZD32huZKyWU9ZEAwwQ0Oq9gPqECWWZkdT4LInF6SLWLY=
- secure: E9gahGC9Swvy83Kos9LhFsxZp/zBI6Ll9lqQd6HxT7YSXj2YeoxSMCsF629bODPdtuMirhmFqReKZKL1lDpJBswr1sFtnmVavSwVBW4v/CIAQu0ENC85Knv1wgoAcl7cRisWaueSHJ0DyNstZZWGNWryIINg9zjFdrOSztDvoN8=
- secure: UxCvWwq2GcUdL3BtJyRMEFPHPRGIdPPLthThmWrmUE7dnblpDUdWVXKc62f7Y42qtHlhYh1EjxX0GJFcS1F0Lfge0e0cxDNWBATBoLKpC67kTyz/cUgqFEv6tsbkziBtbOrBuy6/LMZly1BqG/3fIDEJezkKOIqHF+pdApvAC/8=
- secure: LY+rU4ouy35DfnXdTumu+lPQsMPzNWQktXlms1YG1jWqOs7As223fLQAFe5tyVs34K0xQsPCq3whfaDCd4ZNVYLO3srsXSuRpDw8DRt1fQhhVJo8IBI+Yv92FiFZr54BsBxM4Wzt8hFWEzDlIgziOYSriSXMuBomMHXbtm5vkzg=
84 changes: 84 additions & 0 deletions API.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# ui.item.sortable API documentation

This refers to the additional properties that are exposed through the `ui` parameter in the provided callback hooks. eg:
```js
$scope.sortableOptions = {
update: function(e, ui) {
if (ui.item.sortable.model == "can't be moved") {
ui.item.sortable.cancel();
}
}
};
```

## Properties

**Note:**
The properties of `ui.item.sortable` object are cleared right after the stop callback fires. If you need to access them after the sorting ends, you should keep references in separate variables in your code.

### dropindex
Type: [Integer](http://api.jquery.com/Types/#Integer)
Holds the index of the drop target that the dragged item was dropped.


### droptarget
Type: [jQuery](http://api.jquery.com/Types/#jQuery)
Holds the ui-sortable element that the dragged item was dropped on.

### droptargetModel
Type: [Array](http://api.jquery.com/Types/#Array)
Holds the array that is specified by the `ng-model` attribute of the [`droptarget`](#droptarget) ui-sortable element.

### index
Type: [Integer](http://api.jquery.com/Types/#Integer)
Holds the original index of the item dragged.

### model
Type: [Object](http://api.jquery.com/Types/#Object)
Holds the JavaScript object that is used as the model of the dragged item, as specified by the ng-repeat of the [`source`](#source) ui-sortable element and the item's [`index`](#index).

### moved
Type: [Object](http://api.jquery.com/Types/#Object)/`undefined`
Holds the model of the dragged item only when a sorting happens between two connected ui-sortable elements.
In other words: `'moved' in ui.item.sortable` will return false only when a sorting is withing the same ui-sortable element ([`source`](#source) equals to the [`droptarget`](#droptarget)).

### received
Type: [Boolean](http://api.jquery.com/Types/#Boolean)
When sorting between two connected sortables, it will be set to true inside the `update` callback of the [`droptarget`](#droptarget).

### source
Type: [jQuery](http://api.jquery.com/Types/#jQuery)
Holds the ui-sortable element that the dragged item originated from.

### sourceModel
Type: [Array](http://api.jquery.com/Types/#Array)
Holds the array that is specified by the `ng-model` of the [`source`](#source) ui-sortable element.


## Methods

### cancel[()](http://api.jquery.com/Types/#Function)
Returns: Nothing
Can be called inside the `update` callback, in order to prevent/revert a sorting.
Should be used instead of the [jquery-ui-sortable cancel()](http://api.jqueryui.com/sortable/#method-cancel) method.

### isCanceled[()](http://api.jquery.com/Types/#Function)
Returns: [Boolean](http://api.jquery.com/Types/#Boolean)
Returns whether the current sorting is marked as canceled, by an earlier call to [`ui.item.sortable.cancel()`](#cancel).

### isCustomHelperUsed[()](http://api.jquery.com/Types/#Function)
Returns: [Boolean](http://api.jquery.com/Types/#Boolean)
Returns whether the [`helper`](http://api.jqueryui.com/sortable/#option-helper) element used for the current sorting, is one of the original ui-sortable list elements.


## Events

### `ui-sortable:moved`
Is emitted after the `stop` callback.
In connected sortables it is also emitted after the `update` on the receiving sortable.

```js
$rootScope.$on('ui-sortable:moved', function (e, ui) {

});
```
12 changes: 12 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Contributing to UI Sortable

## Reporting Issues

The following examples are provided as a good starting point to demonstrate issues, proposals and use cases.
Feel free to edit any of them for your needs (don't forget to also update the libraries used to your version).

* [Simple Demo](http://codepen.io/thgreasi/pen/jlkhr)
* [Connected Lists](http://codepen.io/thgreasi/pen/uFile)

Since some issues may be caused by jquery-ui-sortable and not by the wrapping that angular-ui-sortable does,
please try your use case using [this plain jquery-ui sortable example](http://codepen.io/thgreasi/pen/rarQvR) before opening a new issue in the repositry.
Loading