Merge fda952f0e9 into b9f24e510c

Gruntfile.js

@@ -214,13 +214,13 @@ module.exports = function(grunt) {
                 files: [
                     {
                         src: [
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                            "node_modules/jquery/dist/jquery.min.js",
+                            "node_modules/jquery-migrate/dist/jquery-migrate.min.js",
+                            "node_modules/jquery-ui/dist/jquery-ui.min.js",
+                            "node_modules/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js",
                             "node_modules/marked/marked.min.js",
                             "node_modules/dompurify/dist/purify.min.js",
-                            "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
+                            "node_modules/d3/d3.min.js",
                             "node_modules/i18next/i18next.min.js",
                             "node_modules/i18next-http-backend/i18nextHttpBackend.min.js",
                             "node_modules/jquery-i18next/jquery-i18next.min.js",
@@ -408,7 +408,6 @@ module.exports = function(grunt) {
                         cwd: 'packages/node_modules/@node-red/editor-client/src/vendor',
                         src: [
                             'ace/**',
-                            'jquery/css/base/**',
                             'font-awesome/**',
                             'monaco/dist/**',
                             'monaco/types/extraLibs.js',
@@ -418,6 +417,14 @@ module.exports = function(grunt) {
                         expand: true,
                         dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
                     },
+                    {
+                        cwd: 'node_modules/jquery-ui/dist/themes',
+                        src: [
+                            'base/**',
+                        ],
+                        expand: true,
+                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/jquery/css/'
+                    },
                     {
                         cwd: 'packages/node_modules/@node-red/editor-client/src',
                         src: [

package.json

@@ -86,6 +86,7 @@
         "@node-rs/bcrypt": "1.10.4"
     },
     "devDependencies": {
+        "d3": "3.0.3",
         "dompurify": "2.4.1",
         "grunt": "1.6.1",
         "grunt-chmod": "~1.1.1",
@@ -107,7 +108,11 @@
         "grunt-simple-mocha": "~0.4.1",
         "grunt-simple-nyc": "^3.0.1",
         "i18next-http-backend": "1.4.1",
+        "jquery": "3.5.1",
         "jquery-i18next": "1.2.1",
+        "jquery-migrate": "3.3.0",
+        "jquery-ui":"1.13.2",
+        "jquery-ui-touch-punch": "0.2.3",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "marked": "4.3.0",
         "mermaid": "^10.4.0",

packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js

@@ -1,11 +0,0 @@
-/*!
- * jQuery UI Touch Punch 0.2.3
- *
- * Copyright 2011–2014, Dave Furfero
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Depends:
- *  jquery.ui.widget.js
- *  jquery.ui.mouse.js
- */
-!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);