diff --git a/README.md b/README.md index 91aed9388..41d4751c1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Demo: http://rubaxa.github.io/Sortable/ * Supports drag handles *and selectable text* (better than voidberg's html5sortable) * Smart auto-scrolling * Built using native HTML5 drag and drop API - * Supports [Meteor](meteor/README.md), [AngularJS](#ng) and [React](#react) + * Supports [Meteor](meteor/README.md), [AngularJS](#ng), [React](#react) and [Polymer](#polymer) * Supports any CSS library, e.g. [Bootstrap](#bs) * Simple API * [CDN](#cdn) @@ -472,6 +472,18 @@ Other attributes are: --- + +### Support Polymer +```html + + + + + + +``` ### Method diff --git a/Sortable.html b/Sortable.html new file mode 100644 index 000000000..dc93d654c --- /dev/null +++ b/Sortable.html @@ -0,0 +1,139 @@ + + + + + + + diff --git a/bower.json b/bower.json index fae6f7a22..c934c0ec2 100644 --- a/bower.json +++ b/bower.json @@ -19,7 +19,8 @@ "drag", "and", "drop", - "dnd" + "dnd", + "web-components" ], "license": "MIT", "ignore": [ @@ -27,5 +28,8 @@ "bower_components", "test", "tests" - ] + ], + "dependencies": { + "polymer": "Polymer/polymer#~1.1.4", + } } diff --git a/log.txt b/log.txt deleted file mode 100644 index 3acc32890..000000000 --- a/log.txt +++ /dev/null @@ -1,1401 +0,0 @@ -commit 72be2e91aec387a23cf84fb9ec831a906df4ae7c -Author: RubaXa -Date: Thu May 7 23:28:28 2015 +0300 - - #376: * fixed 'evt.target' - - Sortable.js | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 08c31fc0bba9509280f2f3847ab47bee2ea9bab9 -Author: RubaXa -Date: Thu May 7 23:14:18 2015 +0300 - - #379: + 'delay' description - - Sortable.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 14864bc067dc937b88031dac77344ad9c44fa7aa -Author: RubaXa -Date: Thu Apr 16 18:15:27 2015 +0300 - - #335: call save only if 'active' - - Sortable.js | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -commit a89b3b3edc6422f1b3540a4811434d4900d91719 -Author: RubaXa -Date: Wed Apr 15 14:27:28 2015 +0300 - - #347: + moveVector - - Sortable.js | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -commit 34328a81b527218358b4bb17ca8613d2891a2c82 -Author: RubaXa -Date: Wed Apr 15 13:19:18 2015 +0300 - - #273: + onMove event - - Sortable.js | 113 ++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 72 insertions(+), 41 deletions(-) - -commit b30ece99c5c87752db61b452e04467e0a3cf5f79 -Author: RubaXa -Date: Tue Apr 14 21:37:41 2015 +0300 - - v1.2.0: Events, Nested, Drop text, IE11, iframe and etc - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c1f6cf50c4fc6fa16d12c0c804fe8464bbda0c0f -Author: RubaXa -Date: Sat Apr 11 11:13:32 2015 +0300 - - #308: * allow drop text - - Sortable.js | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -commit 5c4e3dce2a8b0b28c0e7d7235377d13cc71a9bbd -Author: RubaXa -Date: Thu Apr 9 11:42:14 2015 +0300 - - #318, #328: + Improved work with events transmitted through the options - - Sortable.js | 63 ++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 29 insertions(+), 34 deletions(-) - -commit fcdb0c915b0e4c7fb429f765cdb5a10ab3226e27 -Merge: 40af728 c6a536a -Author: RubaXa -Date: Thu Apr 9 10:57:16 2015 +0300 - - + master v1.1.1 - -commit 40af728d53c8ed6ca41dead85ceb08d71b8a77fa -Author: RubaXa -Date: Mon Apr 6 00:00:55 2015 +0300 - - #325: * changed the order of the methods (code style) - - Sortable.js | 156 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 78 insertions(+), 78 deletions(-) - -commit 723bc1e605de32555fa9e5fd5d531832cfc9848e -Author: RubaXa -Date: Sun Apr 5 23:57:39 2015 +0300 - - #325: PR refactoring: - _enableDragStart & revert lost fixes - - Sortable.js | 103 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 54 insertions(+), 49 deletions(-) - -commit 78c53ba5e19c6616893183e655cf9d28cb1ec77d -Author: jboulouloubi -Date: Wed Apr 1 18:35:36 2015 -0400 - - Add delay between touchstart and dragstart - - Sortable.js | 135 ++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 86 insertions(+), 49 deletions(-) - -commit 5fd36b19b18ef81148ae38078a159fbd281120aa -Author: RubaXa -Date: Wed Mar 11 18:36:32 2015 +0300 - - * RSPACE - - Sortable.js | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 6dc1159d3166272f579da1618b80c9bc3bcd3437 -Merge: 8b818ed f802c84 -Author: Lebedev Konstantin -Date: Wed Mar 11 18:35:47 2015 +0300 - - Merge pull request #296 from bmustiata/dev - - Don't join class names when removing classes after additions. - -commit 8b818ed280bfe54e4e51d5ff375f751eb590239f -Author: RubaXa -Date: Wed Mar 11 18:33:36 2015 +0300 - - #288: + use 'ownerDocument' for correct working with/into iframe - - Sortable.js | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -commit 7309734dbf52e0e9d9682ad563660a5d0acb51de -Author: RubaXa -Date: Wed Mar 11 18:06:34 2015 +0300 - - #290: + clone simple 'option' and 'extend' method - - Sortable.js | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -commit 1f58b1b10b7eca676654e0989c7831ae8e9f9fdd -Author: Noah Chase -Date: Tue Mar 10 12:38:43 2015 -0400 - - use `page{d}Offset` instead of `scroll{d}` - - All modern browsers seem to support `window.pageXOffset` and `window.pageYOffset`, which are aliases for `window.scrollX` and `window.scrollY`. - - IE doesn't seem to have `window.scrollX` and `window.scrollY`. - - fixes #302 - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f802c84d05f49adcbf8627dedb689225a27afba9 -Author: Bogdan Mustiata -Date: Thu Mar 5 12:13:56 2015 +0100 - - Use precompiled RegExp. - - Sortable.js | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -commit c7257ae198ba136ebec55b9cfae760f9e89c4e9a -Author: Bogdan Mustiata -Date: Tue Mar 3 14:53:15 2015 +0100 - - Don't join class names when removing classes after additions. - - Sortable.js | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit c6a536aa3f999b2c556f301527fa1e7186a67d65 -Author: RubaXa -Date: Fri Feb 20 08:49:33 2015 +0300 - - v1.1.1: #227, #285 - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 0b909aa59d24e90220f549e4d4106b6e0b760f05 -Author: RubaXa -Date: Thu Feb 19 21:20:16 2015 +0300 - - #285: * fixed dragover handler - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 87e336a175ec4d0e593df685fe1f9ced612395fd -Author: RubaXa -Date: Mon Feb 16 08:57:02 2015 +0300 - - #277: * fixed handle & filter - - Sortable.js | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -commit 1482449b1816b7bdce9f96be51c47000b9a73453 -Author: RubaXa -Date: Thu Feb 19 21:20:16 2015 +0300 - - #285: * fixed dragover handler - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8b3e8f949710d3360c92b8fdc2d9f3fcd58d7e30 -Author: RubaXa -Date: Mon Feb 16 18:06:58 2015 +0300 - - #279: * dataAttr -> dataIdAttr - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7dc8be57559534d5a93cf5aff1306a0f83daf56d -Author: RubaXa -Date: Mon Feb 16 17:55:24 2015 +0300 - - #279: + dataIdAttr - - Sortable.js | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -commit 1c8839f08fdbe5399a216cfa4872df97eda794a6 -Author: RubaXa -Date: Mon Feb 16 08:57:02 2015 +0300 - - #277: * fixed handle & filter - - Sortable.js | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -commit 070a5715084c860dc8ddd5bedd17be09ccf7a102 -Author: RubaXa -Date: Fri Feb 13 22:01:00 2015 +0300 - - v1.1.0: Support IE9, CDN, enhancement auto-scrolling, React-mixin and more. - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 563311f25eddbeb7b0276593f5a7d787504c7026 -Author: RubaXa -Date: Wed Feb 11 23:16:46 2015 +0300 - - #271: + remove 'transform' (#issuecomment-73954644) - - Sortable.js | 1 + - 1 file changed, 1 insertion(+) - -commit 4c0f1afd324e8b598782a8fa62bfa5b8a21401ef -Author: RubaXa -Date: Wed Feb 11 19:12:00 2015 +0300 - - #256: - _onDrag - - Sortable.js | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -commit e97970b303af821d517ecc42a5f97c8a5fd77e28 -Author: RubaXa -Date: Wed Feb 11 18:12:28 2015 +0300 - - #256: uber-autoscroll, support drag between lists - - Sortable.js | 172 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 90 insertions(+), 82 deletions(-) - -commit f0d7ff7339f48f417c0ad549123809fe9c7fa6e0 -Merge: ab52c13 750bef7 -Author: RubaXa -Date: Wed Feb 11 16:56:07 2015 +0300 - - Merge branch 'dev' into scroll - -commit 750bef7a8f95349b158d7fafcda05ee25de77d6b -Merge: 64ec81a 15d6f07 -Author: RubaXa -Date: Wed Feb 11 16:55:55 2015 +0300 - - Merge branch 'drop-text' into dev - -commit ab52c138509968f1c85dd2c3d5205a85e54ef797 -Author: RubaXa -Date: Tue Feb 10 23:20:37 2015 +0300 - - #271: * logic of auto-scrolling - - Sortable.js | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -commit d2fa23b897900043cfdc156e09dfbabd62a63f8f -Merge: c71b88f 21bf07a -Author: RubaXa -Date: Mon Feb 9 17:21:50 2015 +0300 - - + merge 'dev' - -commit 21bf07a93fe0ec9a997a6d81b117ce64198e2837 -Author: RubaXa -Date: Mon Feb 9 17:16:40 2015 +0300 - - #256: * fixed auto-scrolling - - Sortable.js | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -commit 15d6f07a01f299bc1aa2f4240ae6713414e797ad -Author: RubaXa -Date: Sat Feb 7 23:06:01 2015 +0300 - - #254: + check 'effectAllowed' on 'dragover' - - Sortable.js | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 7bff4352d60cc1991f245777bfa858e663a8faaa -Author: RubaXa -Date: Fri Feb 6 12:24:01 2015 +0300 - - #250: + additional check - - Sortable.js | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -commit c71b88f0756a3cafe62eec4a93ddf82b8798d120 -Author: RubaXa -Date: Fri Feb 6 11:38:35 2015 +0300 - - #251: + 'mousemove' unbind - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c9051c24e18269ad13ce5ba4ddcf5ac7406f4e0a -Author: RubaXa -Date: Mon Feb 2 14:20:04 2015 +0300 - - + support IE9 - - Sortable.js | 37 ++++++++++++++++++++++--------------- - 1 file changed, 22 insertions(+), 15 deletions(-) - -commit fb3abe8224d40e6d168f832d73a6caa0e96e004f -Merge: 705b3ed dce3eb2 -Author: RubaXa -Date: Tue Jan 27 23:47:58 2015 +0300 - - Merge branch 'dev' of github.com:RubaXa/Sortable into dev - -commit f500b679f22b5aadf794a522751d5bb13ba881a0 -Author: RubaXa -Date: Tue Jan 27 23:47:16 2015 +0300 - - #238: * disabled - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5325c8a84224f231578f092ca56382480652cc91 -Author: Markus Ast -Date: Tue Jan 27 16:41:11 2015 +0100 - - fix index calculation to skip templates - - Sortable.js | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 0ce769bb479c562882aab65bf5e5c9c5afba5f55 -Merge: 8f2aa5e fa2651f -Author: RubaXa -Date: Mon Jan 26 22:07:44 2015 +0300 - - v1.0.1: #231, #210, #207, #205, #151 - -commit 8f2aa5eb68f5f31fc1cd0db7a5a3d76c06878803 -Author: RubaXa -Date: Mon Jan 26 16:02:31 2015 +0300 - - + create 'cloneEl' on dragStart - - Sortable.js | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -commit 06aac74871f3fd25a454df2fd7709ae5494e48ab -Author: RubaXa -Date: Mon Jan 12 18:56:35 2015 +0300 - - #210: + 'dropBubble: false' & 'dragoverBubble: false' options - - Sortable.js | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -commit 3f909d84df4dcbc5e82367d7cde65536117f4660 -Author: RubaXa -Date: Sat Jan 10 21:15:37 2015 +0300 - - #207: * newIndex - - Sortable.js | 39 ++++++++++++++++++++++----------------- - 1 file changed, 22 insertions(+), 17 deletions(-) - -commit a5532380f9956b13b969ede386c85e568ba26a30 -Author: RubaXa -Date: Sat Jan 10 20:19:41 2015 +0300 - - #205: * support 'clone' for angular - - Sortable.js | 1 + - 1 file changed, 1 insertion(+) - -commit b1daa70a2a067bb3c9a577dff7b1f0986e3cf057 -Author: raphj -Date: Sun Dec 28 10:26:28 2014 +0100 - - Make Sotable compatible xhtml - - comparisons of node names (via the nodeName property) are done in upper case. However, nodeName is lower case in xhtml. Let's do everything in upper case. - - Sortable.js | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 0ffa616f100fb340944ccb38e8b6f85020e10c51 -Author: RubaXa -Date: Fri Dec 26 09:20:11 2014 +0300 - - #199: + check 'dataTransfer' exists - - Sortable.js | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 9c618aa83b30dea81fa621a1376776c770df91bf -Author: RubaXa -Date: Fri Dec 19 17:57:25 2014 +0300 - - #185: finaly fix group & mobile - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8ee92ddd32722240343d7e2e53ba27e2b149b1aa -Author: RubaXa -Date: Fri Dec 19 17:39:24 2014 +0300 - - #185: fixed group & touch - - Sortable.js | 34 ++++++++++++++++++++++------------ - 1 file changed, 22 insertions(+), 12 deletions(-) - -commit 126cd94a0a3b4f71fb87928857eafc5a69119c84 -Merge: 9a9670e 91a1569 -Author: RubaXa -Date: Fri Dec 19 10:10:29 2014 +0300 - - Merge branch 'dev' of github.com:RubaXa/Sortable into dev - -commit 9a9670ec4c6bb61dc8beb0acbb0d7b09109e17e3 -Author: RubaXa -Date: Fri Dec 19 10:10:02 2014 +0300 - - #184: * 'start' event - - Sortable.js | 36 +++++++++++++++++------------------- - 1 file changed, 17 insertions(+), 19 deletions(-) - -commit a22f9c1fc784b8dd92a2d3cb049e337a0410fa44 -Author: Roel van Duijnhoven -Date: Thu Dec 18 12:18:02 2014 +0100 - - Sort event does not always fire - - In the dev branch the `sort` event is not always correctly called on the receiving list. This IS working in the latest released branch. The fix is trivial and included in this PR. - - The case is illustrated in this JsBin: http://jsbin.com/muxojulevo/3/edit. It occurs whenever an item is picked up from a list and dropped in a nested container. - - Sortable.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b2fe4710125b98366d030f9b2e12e84bd8e5ee0d -Author: RubaXa -Date: Thu Dec 18 00:16:05 2014 +0300 - - #131: v1.0, done - - Sortable.js | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 6656e45f302469f37aa7da0f9b68d70ff0b2f100 -Author: RubaXa -Date: Tue Dec 16 20:50:38 2014 +0300 - - #166: fixed _onDragOver & group - - Sortable.js | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -commit 8141f12db3d179b4c89fbc407d3176de81032744 -Author: RubaXa -Date: Tue Dec 16 19:53:14 2014 +0300 - - #173: + save() method - - Sortable.js | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -commit 73f1f09aad6aa441fef46a0bcff18a815b38f4ce -Author: RubaXa -Date: Tue Dec 16 19:42:04 2014 +0300 - - #172: + _cloneHide - - Sortable.js | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -commit c5b305011d58ba995555c68819b2c671517d7e95 -Author: RubaXa -Date: Mon Dec 15 11:35:06 2014 +0300 - - #171: + preventDefault - - Sortable.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 0163bcd1660cd849af499cb01d9fa579102cce15 -Merge: ea1aa2d a71c6a0 -Author: RubaXa -Date: Mon Dec 15 00:31:12 2014 +0300 - - Merge branch 'dev' of github.com:RubaXa/Sortable into dev - -commit ea1aa2de6b0569384db5ebed939ee3443824ca5a -Author: RubaXa -Date: Mon Dec 15 00:27:40 2014 +0300 - - #166: + stopPropagation in _onDragOver - - Sortable.js | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit a71c6a0f401824466338fcade05509072ee01299 -Merge: d6dcc64 df59738 -Author: Lebedev Konstantin -Date: Sun Dec 14 10:27:26 2014 +0300 - - Merge pull request #168 from ghjunior/index-ignore-template - - Ignore