From 5118643b6654aa69023288ec4e5b9ccb80a30a03 Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 09:05:14 +0000 Subject: [PATCH 1/7] Add package.json. --- package.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..eeadc0a --- /dev/null +++ b/package.json @@ -0,0 +1,28 @@ +{ + "name": "dragtable", + "version": "2.0.15", + "description": "A draggable column table plugin for jquery.", + "main": "jquery.dragtable.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/akottr/dragtable.git" + }, + "author": "Andres ", + "license": "MIT GPL", + "bugs": { + "url": "https://github.com/akottr/dragtable/issues" + }, + "homepage": "http://akottr.github.io/dragtable", + "keywords": [ + "table", + "jquery", + "draggable" + ], + "dependencies": { + "jquery": "*", + "jquery-ui": "1.11.*" + } +} From a12c4b3bb54811ab2a76a56076d017d2af9166f6 Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 09:26:56 +0000 Subject: [PATCH 2/7] Fix dependencies. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index eeadc0a..d9188ed 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "draggable" ], "dependencies": { - "jquery": "*", - "jquery-ui": "1.11.*" + "jquery": "~2.1.1", + "jquery-ui": "~1.11.4" } } From cace38bddcfb083d9674bcb8f580ec7207393f7c Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 09:59:58 +0000 Subject: [PATCH 3/7] Remove jquery-ui from dependencies. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index d9188ed..608d790 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "draggable" ], "dependencies": { - "jquery": "~2.1.1", - "jquery-ui": "~1.11.4" + "jquery": "~2.1.1" } } From a406a478e9b318a7760e5557187b82379bda7ac7 Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 14:52:57 +0000 Subject: [PATCH 4/7] Remove dependencies from package.json. --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 608d790..c93fe80 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,5 @@ "table", "jquery", "draggable" - ], - "dependencies": { - "jquery": "~2.1.1" - } + ] } From 6cf5c45fa60694af18976795451ec28d6f808ee7 Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 14:54:22 +0000 Subject: [PATCH 5/7] Consider only visible headers. --- jquery.dragtable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.dragtable.js b/jquery.dragtable.js index 00cd9f8..ec1b829 100644 --- a/jquery.dragtable.js +++ b/jquery.dragtable.js @@ -238,7 +238,7 @@ var width_li = $(this).is(':visible') ? $(this).outerWidth() : 0; sortableHtml += '
  • '; sortableHtml += ''; - var row = thtb.find('> tr > th:nth-child(' + (i + 1) + ')'); + var row = thtb.find('> tr > th:nth-child(' + (i + 1) + '):visible'); if (_this.options.maxMovingRows > 1) { row = row.add(thtb.find('> tr > td:nth-child(' + (i + 1) + ')').slice(0, _this.options.maxMovingRows - 1)); } From 233bf1484c1311888ae910a02550c441623b2a94 Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 14:55:05 +0000 Subject: [PATCH 6/7] Do not add a border on dragable-sortable, since it may differ from the original table header. --- dragtable.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dragtable.css b/dragtable.css index 12b73be..573db6c 100644 --- a/dragtable.css +++ b/dragtable.css @@ -18,10 +18,6 @@ border-left: 0px; } -.dragtable-sortable li:first-child th, .dragtable-sortable li:first-child td { - border-left: 1px solid #CCC; -} - .ui-sortable-helper { opacity: 0.7;filter: alpha(opacity=70); } From 11d3c41f5d5b94f12c6389f58d0c41ffee765243 Mon Sep 17 00:00:00 2001 From: Vitor Pelizza Date: Fri, 23 Feb 2018 16:53:28 +0000 Subject: [PATCH 7/7] Pass jQuery event on callback beforeStart. --- jquery.dragtable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.dragtable.js b/jquery.dragtable.js index ec1b829..139f887 100644 --- a/jquery.dragtable.js +++ b/jquery.dragtable.js @@ -333,7 +333,7 @@ this.bindTo.mousedown(function(evt) { // listen only to left mouse click if(evt.which!==1) return; - if (_this.options.beforeStart(_this.originalTable) === false) { + if (_this.options.beforeStart(_this.originalTable, evt) === false) { return; } clearTimeout(this.downTimer);