use tablednd from npm

diff --git a/composer.json b/composer.json
index d213fdf9581a18a7667f572be5073f0708dc83fc..516e227b3dc86214b5517023c1415f286253e96b 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -25,10 +25,10 @@
     "andy128k/routeexpression": "dev-master",
     "andy128k/ipf-legacy-template": "dev-master",
     "bower-asset/jquery-ui": "~1",
-    "bower-asset/TableDnD": "dev-master",
     "bower-asset/jqueryui-timepicker-addon": "dev-master",
     "bower-asset/tinymce-dist": "~4.1",
-    "npm-asset/jquery": "~2"
+    "npm-asset/jquery": "~2",
+    "npm-asset/tablednd": "^1.0@dev"
   },
   "require-dev": {
     "phpunit/phpunit": "4.4.*"

diff --git a/composer.lock b/composer.lock
index ceac9936877fa0b4b2cc353cae0a2d4c510ef77c..347b12f13ef2640b2fdbeb8f73b7f05d3cccc012 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "31569304ec8f7b6cc8527629bc040b76",
+    "content-hash": "5a4e962b8864d76f208994b0b2791f7b",
     "packages": [
         {
             "name": "andy128k/ipf-legacy-template",
@@ -192,38 +192,6 @@
             "description": "Route expression",
             "time": "2015-01-11T10:36:51+00:00"
         },
-        {
-            "name": "bower-asset/TableDnD",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/isocra/TableDnD.git",
-                "reference": "338bbc52587d00352d6680073842dfbea8a04aa3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/isocra/TableDnD/zipball/338bbc52587d00352d6680073842dfbea8a04aa3",
-                "reference": "338bbc52587d00352d6680073842dfbea8a04aa3",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/jquery": ">=1.7.0"
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": [
-                    "./js/jquery.tablednd.js"
-                ],
-                "bower-asset-ignore": [
-                    "LICENCE",
-                    "README.md"
-                ],
-                "branch-alias": {
-                    "dev-master": "0.9.1-dev"
-                }
-            },
-            "time": "2018-01-14T13:06:17+00:00"
-        },
         {
             "name": "bower-asset/jquery",
             "version": "2.2.4",
@@ -944,6 +912,57 @@
             ],
             "time": "2016-05-20T17:26:07+00:00"
         },
+        {
+            "name": "npm-asset/tablednd",
+            "version": "1.0.3",
+            "dist": {
+                "type": "tar",
+                "url": "https://registry.npmjs.org/tablednd/-/tablednd-1.0.3.tgz",
+                "reference": null,
+                "shasum": "0c6992bc7fe3ec5e880344684479c9df90c0442b"
+            },
+            "require-dev": {
+                "npm-asset/grunt": ">=0.4.5,<0.5.0",
+                "npm-asset/grunt-contrib-jshint": ">=0.10.0,<0.11.0",
+                "npm-asset/grunt-contrib-uglify": ">=0.6.0,<0.7.0",
+                "npm-asset/jshint": ">=2.9.3,<3.0.0",
+                "npm-asset/release-it": ">=5.2.0,<6.0.0"
+            },
+            "type": "npm-asset-library",
+            "extra": {
+                "npm-asset-bugs": {
+                    "url": "https://github.com/isocra/TableDnD/issues"
+                },
+                "npm-asset-main": "Gruntfile.js",
+                "npm-asset-directories": [],
+                "npm-asset-repository": {
+                    "type": "git",
+                    "url": "git+https://github.com/isocra/TableDnD.git"
+                },
+                "npm-asset-scripts": {
+                    "test": "grunt test",
+                    "release": "release-it"
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "DenisH"
+                }
+            ],
+            "description": "JQuery plugin for dragging and droping rows in a table",
+            "homepage": "https://github.com/isocra/TableDnD#readme",
+            "keywords": [
+                "and",
+                "drag",
+                "drop",
+                "jquery",
+                "tablednd"
+            ],
+            "time": "2018-01-14T12:59:24+00:00"
+        },
         {
             "name": "pear/archive_tar",
             "version": "1.3.16",
@@ -2010,8 +2029,8 @@
         "andy128k/pegp": 20,
         "andy128k/routeexpression": 20,
         "andy128k/ipf-legacy-template": 20,
-        "bower-asset/tablednd": 20,
-        "bower-asset/jqueryui-timepicker-addon": 20
+        "bower-asset/jqueryui-timepicker-addon": 20,
+        "npm-asset/tablednd": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

diff --git a/ipf/admin/assets/js/admin.js b/ipf/admin/assets/js/admin.js
index ea2a9a924e4af01144665735c5e34fd5508b1512..9a9a0e31a1d9a1649a396825b4640f750a3e9c14 100644 (file)
--- a/ipf/admin/assets/js/admin.js
+++ b/ipf/admin/assets/js/admin.js
@@ -2,7 +2,7 @@
 //= require jquery-ui/jquery-ui.min.js
 //= require jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js
 //= require jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-addon-i18n.min.js
-//= require TableDnD/dist/jquery.tablednd.min.js
+//= require tablednd/dist/jquery.tablednd.min.js
 //= require tinymce.js
 
 $(function(){