diff --git a/Gemfile b/Gemfile index 857c7e7b3..7c338a74b 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,6 @@ gem "groupdate", "~> 6.4.0" gem "image_processing", "~> 1.12.2" gem "initialjs-rails", "~> 0.2.0.9" gem "invisible_captcha", "~> 2.3.0" -gem "jquery-fileupload-rails" gem "kaminari", "~> 1.2.2" gem "mini_magick", "~> 4.12.0" gem "omniauth", "~> 2.1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 54e7cdaa4..5cb737e2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,10 +282,6 @@ GEM railties (>= 3.1, < 7.0) invisible_captcha (2.3.0) rails (>= 5.2) - jquery-fileupload-rails (1.0.0) - actionpack (>= 3.1) - railties (>= 3.1) - sassc json (2.7.1) jwt (2.7.1) kaminari (1.2.2) @@ -728,7 +724,6 @@ DEPENDENCIES image_processing (~> 1.12.2) initialjs-rails (~> 0.2.0.9) invisible_captcha (~> 2.3.0) - jquery-fileupload-rails kaminari (~> 1.2.2) knapsack_pro (~> 7.0.1) launchy (~> 2.5.2) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0d39d6e64..c6d884ea0 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -50,7 +50,8 @@ //= require jquery-ui/ui/i18n/datepicker-en-GB //= require jquery-ui/ui/widgets/autocomplete //= require jquery-ui/ui/widgets/sortable -//= require jquery-fileupload/basic +//= require blueimp-file-upload/js/jquery.iframe-transport +//= require blueimp-file-upload/js/jquery.fileupload //= require foundation-sites //= require turbolinks //= require turbolinks_anchors diff --git a/package-lock.json b/package-lock.json index efcc48fb3..b6384e5e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "": { "name": "consuldemocracy", "dependencies": { + "blueimp-file-upload": "9.12.5", "foundation-sites": "^6.6.2", "jquery": "^3.7.1", "jquery-ui": "^1.13.2", @@ -21,6 +22,11 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, + "node_modules/blueimp-file-upload": { + "version": "9.12.5", + "resolved": "https://registry.npmjs.org/blueimp-file-upload/-/blueimp-file-upload-9.12.5.tgz", + "integrity": "sha512-hWHp6GDoNVBV6zmU5voMqFBGAFS7KZ6I1rZhRqIPsj+2XruxPHz7M24Hvl3lcEQizY4mZo0VedIqMT7UEWT5Dg==" + }, "node_modules/entities": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", diff --git a/package.json b/package.json index c1e4c233a..79fef2d2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "consuldemocracy", "dependencies": { + "blueimp-file-upload": "9.12.5", "foundation-sites": "^6.6.2", "jquery": "^3.7.1", "jquery-ui": "^1.13.2",